Package: util-linux Version: 2.11y Author: Guillem Jover Status: sent Debbug: 153410 Description: Debian specific patch for the Hurd porting. diff -Naur util-linux-2.11y/debian/control util-linux-2.11y-patched/debian/control --- util-linux-2.11y/debian/control 2003-01-07 08:22:18.000000000 +0100 +++ util-linux-2.11y-patched/debian/control 2003-01-07 08:28:56.000000000 +0100 @@ -12,8 +12,8 @@ Priority: required Essential: yes Suggests: util-linux-locales, kbd | console-tools -Replaces: miscutils, setterm, getty, fdisk -Conflicts: setterm, getty, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21) +Replaces: miscutils, setterm, fdisk, ${util-linux:Conflicts} +Conflicts: setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), ${util-linux:Conflicts} Description: Miscellaneous system utilities. A mixed bag of system utilities: arch blockdev chkdupexe cfdisk cytune dmesg fdisk fsck.minix getty getopt hwclock ipcrm ipcs mcookie mkfs @@ -33,7 +33,7 @@ messages in other languages than English. Package: mount -Architecture: any +Architecture: alpha arm hppa i386 ia64 m68k mips mipsel powerpc sh s390 sparc sparc64 Essential: yes Pre-Depends: ${mount:Depends} Description: Tools for mounting and manipulating filesystems. @@ -53,7 +53,7 @@ Included are: logger, renice, replay, script, wall Package: fdisk-udeb -Architecture: alpha arm hppa i386 ia64 mips mipsel powerpc +Architecture: alpha arm hppa i386 ia64 mips mipsel powerpc hurd-i386 Priority: standard Section: debian-installer Depends: ${cfdisk-udeb:Depends} diff -Naur util-linux-2.11y/debian/postinst util-linux-2.11y-patched/debian/postinst --- util-linux-2.11y/debian/postinst 2003-01-07 08:22:18.000000000 +0100 +++ util-linux-2.11y-patched/debian/postinst 2003-01-07 08:28:56.000000000 +0100 @@ -19,8 +19,8 @@ rm -f /etc/rcS.d/???hwclock.sh fi -# hwclock does not work on s390 systems -if [ `uname -m` != "s390" ] +# hwclock works on all Linux architectures, except s390. +if [ `uname -s` == "Linux" -a `uname -m` != "s390" ] then update-rc.d -f hwclock.sh remove 2>/dev/null > /dev/null update-rc.d hwclock.sh start 50 S . stop 25 0 6 . > /dev/null diff -Naur util-linux-2.11y/debian/rules util-linux-2.11y-patched/debian/rules --- util-linux-2.11y/debian/rules 2003-01-07 08:22:18.000000000 +0100 +++ util-linux-2.11y-patched/debian/rules 2003-01-07 08:35:50.000000000 +0100 @@ -8,10 +8,14 @@ DEB_HOST_ARCH = $(DEB_BUILD_ARCH) endif +ifndef DEB_HOST_GNU_SYSTEM +DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +endif + export arch = $(DEB_HOST_ARCH) version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog) -fdisk_arch = $(findstring $(arch),alpha i386 powerpc arm mips mipsel hppa ia64) +fdisk_arch = $(findstring $(arch),alpha i386 powerpc arm mips mipsel hppa ia64 hurd-i386) sparc = $(findstring $(arch),sparc) nohwclock = $(findstring $(arch),s390) @@ -19,10 +23,15 @@ ifeq ($(arch),$(fdisk_arch)) SUBDIRS += fdisk endif +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) ifneq ($(arch),$(nohwclock)) SUBDIRS += hwclock endif +endif +ifneq ($(DEB_HOST_GNU_SYSTEM),linux) +util-linux_Conflicts = getty +endif build: $(checkdir) @@ -45,25 +54,29 @@ 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} \ + getopt-1.1.2/getopt text-utils/rev +SBINFILES = disk-utils/mkswap +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) ifneq ($(arch),$(nohwclock)) INITFILES = debian/hwclock.sh debian/hwclockfirst.sh -endif -BINFILES = sys-utils/{arch,dmesg} \ - text-utils/more -SBINFILES = disk-utils/{mkswap,blockdev} login-utils/agetty disk-utils/raw -ifneq ($(arch),$(nohwclock)) SBINFILES += hwclock/hwclock endif -SBINFILES += mount/pivot_root -UBINFILES = sys-utils/{ipcs,ipcrm,setsid} \ - misc-utils/{namei,setterm,mcookie,whereis,ddate} \ - getopt-1.1.2/getopt text-utils/rev disk-utils/fdformat +BINFILES += sys-utils/dmesg +SBINFILES += disk-utils/{blockdev,raw} mount/pivot_root login-utils/agetty +UBINFILES += disk-utils/fdformat +USBINFILES = sys-utils/readprofile disk-utils/elvtune # disk-utils/setfdprm +endif + UBINFILES2= misc-utils/chkdupexe # debian/fdformat # don't strip these ULIBFILES = text-utils/more.help -USBINFILES= sys-utils/readprofile disk-utils/elvtune # disk-utils/setfdprm +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) MOUNTBINFILES = mount/mount mount/umount MOUNTSBINFILES = mount/swapon mount/losetup +endif #BSDBINFILES = # misc-utils/kill BSDUBINFILES = misc-utils/script misc-utils/logger sys-utils/renice \ @@ -77,42 +90,51 @@ # Architecture independant docs MAN1FILES = text-utils/{more,rev}.1 misc-utils/{namei.1,mcookie.1} \ - sys-utils/{arch,readprofile}.1 \ misc-utils/{chkdupexe.1,setterm.1,whereis.1,ddate.1} \ - getopt-1.1.2/getopt.1 -MAN8FILES = sys-utils/{dmesg.8,ipcrm.8,ipcs.8,setsid.8} login-utils/agetty.8 \ - disk-utils/{mkswap.8,blockdev.8} disk-utils/elvtune.8 \ - disk-utils/fdformat.8 disk-utils/raw.8 # disk-utils/setfdprm.8 + sys-utils/arch.1 getopt-1.1.2/getopt.1 +MAN8FILES = sys-utils/{ipcrm.8,ipcs.8,setsid.8} disk-utils/mkswap.8 +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) ifneq ($(arch),$(nohwclock)) MAN8FILES += hwclock/hwclock.8 endif -MAN8FILES += mount/pivot_root.8 - -EXAMPLES = debian/fstab.example2 fdisk/sfdisk.examples \ - getopt-1.1.2/{test,parse}.{ba,tc}sh +MAN1FILES += sys-utils/readprofile.1 +MAN8FILES += login-utils/agetty.8 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 +EXAMPLES = fdisk/sfdisk.examples getopt-1.1.2/{test,parse}.{ba,tc}sh +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +EXAMPLES += debian/fstab.example2 +endif INFOFILES = sys-utils/ipc.info +ifeq ($(DEB_HOST_GNU_SYSTEM),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) MOUNTMAN5FILES = mount/fstab.5 mount/nfs.5 MOUNTMAN8FILES = mount/losetup.8 mount/swapoff.8 mount/umount.8 \ mount/mount.8 mount/swapon.8 MOUNTDOCFILES = mount/README.mount +endif ifneq ($(arch),$(sparc)) -SBINFILES := $(SBINFILES) disk-utils/{fsck.minix,mkfs,mkfs.minix} +SBINFILES := $(SBINFILES) disk-utils/{{fsck,mkfs}.minix,mkfs} MAN8FILES := $(MAN8FILES) disk-utils/{{fsck,mkfs}.minix.8,mkfs.8} endif ifeq ($(arch),$(fdisk_arch)) -USBINFILES:= $(USBINFILES) sys-utils/{tunelp,cytune} SBINFILES := $(SBINFILES) fdisk/{cfdisk,fdisk,sfdisk} -MAN8FILES := $(MAN8FILES) fdisk/{cfdisk.8,fdisk.8,sfdisk.8} \ - sys-utils/{tunelp.8,cytune.8} +MAN8FILES := $(MAN8FILES) fdisk/{cfdisk.8,fdisk.8,sfdisk.8} DOCFILES := $(DOCFILES) fdisk/README.{c,}fdisk +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +USBINFILES:= $(USBINFILES) sys-utils/{tunelp,cytune} +MAN8FILES := $(MAN8FILES) sys-utils/{tunelp.8,cytune.8} +endif endif ifeq ($(arch),$(sparc)) SBINFILES := $(SBINFILES) fdisk/fdisk @@ -135,7 +157,7 @@ binary-arch: checkroot build rm -rf debian/tmp* - install -d debian/tmp/{DEBIAN,bin,sbin,etc/init.d,usr/{share/locale/{cs,da,de,es,fr,it,ja,nl,pt_BR,sv,tr}/LC_MESSAGES,lib/mime/packages,sbin,bin,share/man/{man1,man8},share/info,lib,share/util-linux,share/doc/$(package)/examples,share/lintian/overrides}} + install -d debian/tmp/{DEBIAN,bin,sbin,etc/init.d,usr/{bin,sbin,lib/mime/packages,share/{locale/{cs,da,de,es,fr,it,ja,nl,pt_BR,sv,tr}/LC_MESSAGES,man/{man1,man8},info,$(package),doc/$(package)/examples,lintian/overrides}}} install -s $(BINFILES) debian/tmp/bin install -s $(SBINFILES) debian/tmp/sbin @@ -152,18 +174,25 @@ ifneq ($(INITFILES),) install -m 755 $(INITFILES) debian/tmp/etc/init.d endif - install -m 644 $(ULIBFILES) debian/tmp/usr/share/util-linux + install -m 644 $(ULIBFILES) debian/tmp/usr/share/$(package) install -m 644 $(MAN1FILES) debian/tmp/usr/share/man/man1 install -m 644 $(MAN8FILES) debian/tmp/usr/share/man/man8 install -m 644 $(INFOFILES) debian/tmp/usr/share/info - install -m 644 debian/lintian-override debian/tmp/usr/share/lintian/overrides/util-linux + install -m 644 debian/lintian-override debian/tmp/usr/share/lintian/overrides/$(package) cd po && make install DESTDIR=../debian/tmp +ifneq ($(DOCFILES),) install -m 644 $(DOCFILES) debian/tmp/usr/share/doc/$(package) +endif install -m 644 $(EXAMPLES) debian/tmp/usr/share/doc/$(package)/examples ifeq ($(arch), powerpc) 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) + (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) (cd debian/tmp/sbin ; mv agetty getty) (cd debian/tmp/usr/share/man/man8 ; mv agetty.8 getty.8) ifneq ($(arch), $(nohwclock)) @@ -176,16 +205,19 @@ debian/tmp/usr/share/doc/$(package)/README.getty \ debian/tmp/usr/share/doc/$(package)/README.modems-with-getty rm `find debian/tmp/usr -name \*.bak` +endif install -m 644 debian/changelog \ debian/tmp/usr/share/doc/$(package)/changelog.Debian install -m 644 HISTORY debian/tmp/usr/share/doc/$(package)/changelog find debian/tmp/usr/share/{info,doc,man} -type f | xargs gzip -9 - install -m 644 debian/mime.util-linux debian/tmp/usr/lib/mime/packages/util-linux + 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) ifneq ($(arch),$(nohwclock)) install -m 644 debian/conffiles debian/tmp/DEBIAN/ endif +endif ls debian/tmp/{bin,sbin,usr/{bin,sbin}}/* | xargs dpkg-shlibdeps -putil-linux install -d debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales install -d debian/tmp-util-linux-locales/DEBIAN @@ -196,7 +228,7 @@ install -m 644 debian/changelog debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/changelog.Debian find debian/tmp-util-linux-locales/usr/share/doc -type f | xargs gzip -9 install -m 644 debian/copyright debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/copyright - dpkg-gencontrol -isp -putil-linux + dpkg-gencontrol -isp -putil-linux -Vutil-linux:Conflicts="$(util-linux_Conflicts)" dpkg --build debian/tmp .. ifeq ($(arch),$(fdisk_arch)) @@ -205,6 +237,8 @@ install -d debian/tmp-fdisk-udeb/DEBIAN install -m 755 fdisk/cfdisk fdisk/fdisk fdisk/sfdisk \ debian/tmp-fdisk-udeb/usr/sbin + strip --remove-section=.comment --remove-section=.note \ + debian/tmp-fdisk-udeb/usr/sbin/* ls debian/tmp-fdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pfdisk-udeb dpkg-gencontrol -isp -pfdisk-udeb -Pdebian/tmp-fdisk-udeb -fdebian/files~ @@ -212,6 +246,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) # 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/. @@ -234,6 +269,7 @@ ls debian/tmp-mount/{bin,sbin}/* | xargs dpkg-shlibdeps -pmount dpkg-gencontrol -isp -pmount -Pdebian/tmp-mount dpkg --build debian/tmp-mount .. +endif # Bsdutils install -d debian/tmp-bsd/{DEBIAN,bin,usr/{bin,share/man/{man8,man1},share/doc/bsdutils}} diff -Naur util-linux-2.11y/text-utils/Makefile util-linux-2.11y-patched/text-utils/Makefile --- util-linux-2.11y/text-utils/Makefile 2002-11-25 11:41:24.000000000 +0100 +++ util-linux-2.11y-patched/text-utils/Makefile 2003-01-07 08:28:45.000000000 +0100 @@ -16,7 +16,7 @@ ifeq "$(HAVE_NCURSES)" "yes" BIN:=$(BIN) more -USRBIN:=$(USRBIN) ul pg +USRBIN:=$(USRBIN) ul MAN1:=$(MAN1) ul.1 more.1 pg.1 else ifeq "$(HAVE_TERMCAP)" "yes"