Package: module-init-tools
Version: 3.2-pre1-2
Severity: normal
Tags: patch

When cross-compiling module-init-tools package with dpkg-cross,
resulting deb gets file(s) in etc/modulils.d/arch/ corresponding to
build architecture, not to host architecture.

This is caused by 'uname -m' usage in extra/installarchconf script.

The following patch converts that script to use dpkg-architecture
instead, which handles cross-compiling case properly. Tested by building
powerpc deb on x86 host.

diff -urN module-init-tools-3.2-pre1.orig/extra/installarchconf 
module-init-tools-3.2-pre1/extra/installarchconf
--- module-init-tools-3.2-pre1.orig/extra/installarchconf       2005-05-08 
17:59:01.000000000 +0400
+++ module-init-tools-3.2-pre1/extra/installarchconf    2005-05-08 
18:25:22.000000000 +0400
@@ -1,17 +1,11 @@
 #!/bin/sh
 
 archmodel() {
-    local arch=$(uname -m)
+    local arch=$(dpkg-architecture -qDEB_HOST_ARCH)
     case $arch in
-       i[0-9]86)       arch=i386 ;;
-       x86_64)         arch=i386 ;;
-       arm*)           arch=arm ;;
-       mips*)          arch=mips ;;
-       s390x)          arch=s390 ;;
-       parisc64)       arch=parisc ;;
-       sparc64)        arch=sparc ;;
-       ppc)            arch="powerpc.*" ;;
-       m68k)           arch="m68k.*" ;;
+       i[0-9]86|amd64|x86_64)  arch=i386 ;;
+       powerpc)                arch="powerpc.*" ;;
+       m68k)                   arch="m68k.*" ;;
     esac
     echo $arch
 }
-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (620, 'testing'), (600, 'unstable'), (550, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.11-1-zigzag
Locale: LANG=ru_RU.KOI8-R, LC_CTYPE=ru_RU.KOI8-R (charmap=KOI8-R)

Versions of packages module-init-tools depends on:
ii  libc6                       2.3.2.ds1-21 GNU C Library: Shared libraries an

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to