Package: util-linux
Severity: normal
Tags: patch
User: [email protected]
Usertags: eabi
util-linux wraps many tools that are lifecritical for any
linux system (such as mount) to only be neccessary on linux-gnu.
This is a problem for arm eabi, where DEB_HOST_GNU_SYSTEM is
linux-gnueabi. please use DEB_HOST_ARCH_OS instead.
--- util-linux-2.12r/debian/control.orig 2007-01-11 20:22:39.000000000 +0000
+++ util-linux-2.12r/debian/control 2007-01-11 20:22:49.000000000 +0000
@@ -35,7 +35,7 @@
messages in other languages than English.
Package: mount
-Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64
Essential: yes
Section: admin
Pre-Depends: ${mount:Depends}
@@ -57,7 +57,7 @@
Included are: logger, renice, replay, script, wall
Package: fdisk-udeb
-Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 hurd-i386 sparc s390
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 mips mipsel powerpc ppc64 hurd-i386 sparc s390
Priority: extra
Section: debian-installer
Depends: ${fdisk-udeb:Depends}
@@ -65,7 +65,7 @@
fdisk package
Package: cfdisk-udeb
-Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 hurd-i386 s390
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 mips mipsel powerpc ppc64 hurd-i386 s390
Priority: extra
Section: debian-installer
Depends: ${cfdisk-udeb:Depends}
--- util-linux-2.12r/debian/rules.orig 2007-01-11 20:22:14.000000000 +0000
+++ util-linux-2.12r/debian/rules 2007-01-11 20:22:33.000000000 +0000
@@ -21,7 +21,7 @@
export arch = $(DEB_HOST_ARCH)
version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog)
-fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm mips mipsel hppa ia64 hurd-i386 amd64 s390)
+fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm armeb armel mips mipsel hppa ia64 hurd-i386 amd64 s390)
rdev_arch = $(findstring $(arch),i386 amd64)
sparc = $(findstring $(arch),sparc sparc64)
nohwclock = $(findstring $(arch),s390)
@@ -33,13 +33,13 @@
ifeq ($(arch),$(sparc))
SUBDIRS += fdisk
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
ifneq ($(arch),$(nohwclock))
SUBDIRS += hwclock
endif
endif
-ifneq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifneq ($(DEB_HOST_ARCH_OS),linux)
util-linux_Conflicts = getty
endif
@@ -74,7 +74,7 @@
getopt/getopt text-utils/{rev,line,pg}
SBINFILES = disk-utils/mkswap
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
ifneq ($(arch),$(nohwclock))
INITFILES = debian/hwclock.sh # debian/hwclockfirst.sh
SBINFILES += hwclock/hwclock
@@ -87,7 +87,7 @@
UBINFILES2= misc-utils/chkdupexe # debian/fdformat # don't strip these
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
MOUNTBINFILES = mount/mount mount/umount
MOUNTSBINFILES = mount/swapon mount/losetup
endif
@@ -107,7 +107,7 @@
misc-utils/{chkdupexe.1,setterm.1,whereis.1,ddate.1} \
sys-utils/arch.1 getopt/getopt.1
MAN8FILES = sys-utils/{ipcrm.8,ipcs.8,setsid.8} disk-utils/mkswap.8
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
ifneq ($(arch),$(nohwclock))
MAN8FILES += hwclock/hwclock.8
endif
@@ -119,19 +119,19 @@
EXAMPLES = fdisk/sfdisk.examples getopt/getopt-{test,parse}.{ba,tc}sh
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
EXAMPLES += debian/fstab.example2
endif
INFOFILES = sys-utils/ipc.info
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
DOCFILES = login-utils/{README.getty,README.modems-with-agetty,README.poeigl}
ifneq ($(arch),$(nohwclock))
DOCFILES += debian/README.Debian.hwclock
endif
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
MOUNTMAN5FILES = mount/fstab.5 mount/nfs.5
MOUNTMAN8FILES = mount/losetup.8 mount/swapoff.8 mount/umount.8 \
mount/mount.8 mount/swapon.8
@@ -146,7 +146,7 @@
SBINFILES := $(SBINFILES) fdisk/{cfdisk,fdisk,sfdisk}
MAN8FILES := $(MAN8FILES) fdisk/{cfdisk.8,fdisk.8,sfdisk.8}
DOCFILES := $(DOCFILES) fdisk/README.{c,}fdisk
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
USBINFILES:= $(USBINFILES) sys-utils/{tunelp,cytune}
MAN8FILES := $(MAN8FILES) sys-utils/{tunelp.8,cytune.8}
endif
@@ -209,7 +209,7 @@
(cd debian/tmp/sbin ; mv mkswap mkswap.linux)
(cd debian/tmp/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8)
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
(cd debian/tmp/sbin ; mv agetty getty)
(cd debian/tmp/usr/share/man/man8 ; mv agetty.8 getty.8)
ifneq ($(arch), $(nohwclock))
@@ -230,7 +230,7 @@
install -m 644 debian/mime.$(PACKAGE) debian/tmp/usr/lib/mime/packages/$(PACKAGE)
install -m 644 debian/copyright debian/tmp/usr/share/doc/$(PACKAGE)/copyright
install debian/{preinst,postinst,prerm,postrm} debian/tmp/DEBIAN/
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
ifneq ($(arch),$(nohwclock))
install -m 644 debian/conffiles debian/tmp/DEBIAN/
endif
@@ -292,7 +292,7 @@
dpkg --build debian/tmp-fdisk-udeb ../fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
# Mount
install -d debian/tmp-mount/{DEBIAN,bin,sbin,usr/share/{man/{man8,man5},doc/mount/examples}}
install -m 4755 -o root -s $(MOUNTBINFILES) debian/tmp-mount/bin/.
