Package: util-linux
Version: 2.12p-7
Severity: important
Tags: patch
Here's the debian-specific part of the changes needed to fix FTBFS on
GNU/kFreeBSD. The upstream part is being sent by Guillem Jover directly to
upstream.
As for disabling 10agetty, it is only necessary because the patch adds
#includes of Linux-specific headers unconditionaly. Note that the patch was
already disabled in practice so on GNU/Linux this is a no-op.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-1-k7
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL
set to C)
Versions of packages util-linux depends on:
ii libc6 2.3.5-6 GNU C Library: Shared libraries an
ii libncurses5 5.4-9 Shared libraries for terminal hand
ii libslang2 2.0.4-4 The S-Lang programming library - r
ii libuuid1 1.38-2 universally unique id library
ii zlib1g 1:1.2.3-4 compression library - runtime
util-linux recommends no packages.
-- no debconf information
diff -ur util-linux-2.12p.old/debian/patches/00list
util-linux-2.12p/debian/patches/00list
--- util-linux-2.12p.old/debian/patches/00list 2005-10-06 18:45:25.000000000
+0200
+++ util-linux-2.12p/debian/patches/00list 2005-10-06 19:47:00.000000000
+0200
@@ -1,4 +1,3 @@
-10agetty
10cal-widechar
10cfdisk
10debian
diff -ur util-linux-2.12p.old/debian/rules util-linux-2.12p/debian/rules
--- util-linux-2.12p.old/debian/rules 2005-10-06 18:45:25.000000000 +0200
+++ util-linux-2.12p/debian/rules 2005-10-06 19:52:35.000000000 +0200
@@ -25,7 +25,7 @@
sparc = $(findstring $(arch),sparc)
nohwclock = $(findstring $(arch),s390)
-SUBDIRS=po lib getopt disk-utils login-utils misc-utils mount sys-utils
text-utils
+SUBDIRS=po lib getopt disk-utils login-utils misc-utils sys-utils text-utils
ifeq ($(arch),$(fdisk_arch))
SUBDIRS += fdisk
endif
@@ -36,6 +36,7 @@
ifneq ($(arch),$(nohwclock))
SUBDIRS += hwclock
endif
+SUBDIRS += mount
endif
ifneq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
@@ -68,9 +69,12 @@
SUIDFILES = debian/tmp-mount/bin/{u,}mount
BINFILES = sys-utils/arch text-utils/more
-UBINFILES = sys-utils/{ipcs,ipcrm,setsid} \
- misc-utils/{namei,setterm,mcookie,whereis,ddate} \
+UBINFILES = sys-utils/{ipcrm,setsid} \
+ misc-utils/{namei,mcookie,whereis,ddate} \
getopt/getopt text-utils/{rev,line,pg}
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+UBINFILES += sys-utils/ipcs misc-utils/setterm
+endif
SBINFILES = disk-utils/mkswap
ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
@@ -79,11 +83,15 @@
SBINFILES += hwclock/hwclock
endif
BINFILES += sys-utils/dmesg
-SBINFILES += disk-utils/{blockdev,raw} mount/pivot_root login-utils/agetty
+SBINFILES += disk-utils/{blockdev,raw} mount/pivot_root
UBINFILES += disk-utils/fdformat
USBINFILES = sys-utils/readprofile disk-utils/elvtune # disk-utils/setfdprm
endif
+ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
+SBINFILES += login-utils/agetty
+endif
+
UBINFILES2= misc-utils/chkdupexe # debian/fdformat # don't strip these
ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
@@ -111,11 +119,14 @@
MAN8FILES += hwclock/hwclock.8
endif
MAN1FILES += sys-utils/readprofile.1
-MAN8FILES += login-utils/agetty.8 disk-utils/{blockdev.8,elvtune.8} \
+MAN8FILES += disk-utils/{blockdev.8,elvtune.8} \
sys-utils/dmesg.8 mount/pivot_root.8 \
disk-utils/fdformat.8 disk-utils/raw.8 # disk-utils/setfdprm.8
endif
+ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
+MAN8FILES += login-utils/agetty.8
+endif
EXAMPLES = fdisk/sfdisk.examples getopt/getopt-{test,parse}.{ba,tc}sh
ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
@@ -123,8 +134,11 @@
endif
INFOFILES = sys-utils/ipc.info
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
DOCFILES = login-utils/{README.getty,README.modems-with-agetty,README.poeigl}
+endif
+
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
ifneq ($(arch),$(nohwclock))
DOCFILES += debian/README.Debian.hwclock
endif
@@ -204,11 +218,11 @@
mv -f debian/tmp/sbin/fdisk debian/tmp/sbin/ddisk
mv -f debian/tmp/usr/share/man/man8/fdisk.8
debian/tmp/usr/share/man/man8/ddisk.8
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
+ifneq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
(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)
+ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
(cd debian/tmp/sbin ; mv agetty getty)
(cd debian/tmp/usr/share/man/man8 ; mv agetty.8 getty.8)
ifneq ($(arch), $(nohwclock))
