From ad6d8144026b1ba3ebfe82abf507aeb27f4688d4 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Sun, 8 Jul 2007 17:09:00 -0600 Subject: [PATCH] v2.12r-17 --- debian/changelog | 7 +++++++ debian/control | 6 +++--- debian/patches/30swsusp-resume.dpatch | 5 +++-- debian/rules | 26 +++++++++++++------------- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94a74365..b38132ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +util-linux (2.12r-17) unstable; urgency=low + + * Userspace software suspend fix. Closes: #409365 + * armel support. Closes: #408816 + + -- LaMont Jones Fri, 2 Feb 2007 11:08:04 -0700 + util-linux (2.12r-16) unstable; urgency=low * actually apply 30swsusp-resume. And support userspace sw susp too. diff --git a/debian/control b/debian/control index 87ac76f3..fb20d1b2 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Description: Locales files for util-linux 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 @@ Description: Basic utilities from 4.4BSD-Lite 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 @@ Description: Partition a hard drive (manual) 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} diff --git a/debian/patches/30swsusp-resume.dpatch b/debian/patches/30swsusp-resume.dpatch index e05a6748..3bad8c0d 100755 --- a/debian/patches/30swsusp-resume.dpatch +++ b/debian/patches/30swsusp-resume.dpatch @@ -67,7 +67,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./mount/swapon.c /tmp/dpep-work.5ak7Cm/ #define SWAPON_NEEDS_TWO_ARGS -@@ -164,6 +168,84 @@ +@@ -164,6 +168,85 @@ return 0 ; } @@ -98,7 +98,8 @@ diff -urNad --exclude=CVS --exclude=.svn ./mount/swapon.c /tmp/dpep-work.5ak7Cm/ + if (lseek(fd, n, SEEK_SET) >= 0 && + read(fd, buf, sizeof buf) == sizeof buf && + (memcmp("S1SUSPEND", buf, 9)==0 || -+ memcmp("S2SUSPEND", buf, 9)==0)) ++ memcmp("S2SUSPEND", buf, 9)==0 || ++ memcmp("ULSUSPEND", buf, 9)==0)) + re = 0; + + close(fd); diff --git a/debian/rules b/debian/rules index 387d5852..b67d70b9 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ 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 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 @@ endif 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 @@ -73,7 +73,7 @@ UBINFILES = sys-utils/{ipcs,ipcrm,setsid} \ 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 SBINFILES += hwclock/hwclock @@ -86,7 +86,7 @@ endif 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 @@ -106,7 +106,7 @@ MAN1FILES = text-utils/{pg,more,line,rev}.1 misc-utils/{namei.1,mcookie.1} \ 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 @@ -118,19 +118,19 @@ endif 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 @@ -145,7 +145,7 @@ ifeq ($(arch),$(fdisk_arch)) 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 @@ -205,7 +205,7 @@ 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-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)) @@ -226,7 +226,7 @@ endif 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 @@ -288,7 +288,7 @@ ifeq ($(arch),$(sparc)) 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/. -- 2.39.5