[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#492542: FTBFS on hurd



Package: util-linux
Version: 2.14~rc2-0
Severity: wishlist
Tags: patch

Hello,

Your package fails to build from source on hurd. Attached is a patch
which fixes the issue. There are changes in upstream sources, I will
forward them.

Cheers,

-- 
Stephane Glondu

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.25-2-686-bigmem (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u util-linux-2.14~rc2/debian/changelog util-linux-2.14~rc2/debian/changelog
--- util-linux-2.14~rc2/debian/changelog
+++ util-linux-2.14~rc2/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.14~rc2-0+hurd.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Don't build ldattach and rdev on non-Linux.
+
+ -- Stephane Glondu <steph@glondu.net>  Sun, 27 Jul 2008 02:27:47 +0200
+
 util-linux (2.14~rc2-0) experimental; urgency=low
 
   [Steve Grubb]
diff -u util-linux-2.14~rc2/debian/rules util-linux-2.14~rc2/debian/rules
--- util-linux-2.14~rc2/debian/rules
+++ util-linux-2.14~rc2/debian/rules
@@ -32,9 +32,9 @@
 version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog)
 Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog)
 
-CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
+CONFOPTS= --enable-raw --enable-partx --with-slang
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-CONFOPTS += --with-selinux
+CONFOPTS += --enable-rdev --with-selinux
 endif
 ifneq ($(DISTRO),Debian)
 CONFOPTS += --with-fsprobe=volume_id 
@@ -88,10 +88,10 @@
 	dh_movefiles --sourcedir=debian/util-linux -i -s
 	#
 	# XXX - push things to where debian has always(?) had them...
-	mv debian/util-linux/usr/sbin/*part* debian/util-linux/usr/bin
+	-mv debian/util-linux/usr/sbin/*part* debian/util-linux/usr/bin
 	mv debian/util-linux/usr/bin/tailf debian/util-linux/bin
 	mv debian/util-linux/usr/bin/isosize debian/util-linux/sbin
-	mv debian/util-linux/usr/bin/cytune debian/util-linux/usr/sbin
+	-mv debian/util-linux/usr/bin/cytune debian/util-linux/usr/sbin
 	mv debian/util-linux/usr/share/man/man8/linux32.8 debian/util-linux/usr/share/man/man1/linux32.1
 	mv debian/util-linux/usr/share/man/man8/linux64.8 debian/util-linux/usr/share/man/man1/linux64.1
 	# the version in bsdmainutils seems newer.
reverted:
--- util-linux-2.14~rc2/debian/util-linux.conffiles
+++ util-linux-2.14~rc2.orig/debian/util-linux.conffiles
@@ -1 +0,0 @@
-/etc/init.d/hwclock.sh
only in patch2:
unchanged:
--- util-linux-2.14~rc2.orig/sys-utils/Makefile.am
+++ util-linux-2.14~rc2/sys-utils/Makefile.am
@@ -16,16 +16,19 @@
 sbin_PROGRAMS = ctrlaltdel
 endif
 
-usrsbinexec_PROGRAMS = ldattach readprofile
+usrsbinexec_PROGRAMS = readprofile
 if LINUX
-usrsbinexec_PROGRAMS += tunelp rtcwake
+usrsbinexec_PROGRAMS += ldattach tunelp rtcwake
 endif
 
 tunelp_SOURCES = tunelp.c lp.h
 
-dist_man_MANS = flock.1 readprofile.1 \
-	ctrlaltdel.8 cytune.8 dmesg.1 ipcrm.1 ipcs.1 ldattach.8 renice.1 \
-	setsid.1 tunelp.8 setarch.8 rtcwake.8
+dist_man_MANS = flock.1 readprofile.1 ctrlaltdel.8 dmesg.1 ipcrm.1 \
+	ipcs.1 ldattach.8 renice.1 setsid.1
+
+if LINUX
+dist_man_MANS += cytune.8 ldattach.8 tunelp.8 rtcwake.8 setarch.8
+endif
 
 info_TEXINFOS = ipc.texi
 

Reply to: