Package: util-linux Version: 2.12p-2 Severity: wishlist Tags: patch Hello,
util-linux ships no rdev on amd64, see attached diff. Kind regards Frederik Schueler -- ENOSIG
diff -u util-linux-2.12p/debian/changelog util-linux-2.12p/debian/changelog
--- util-linux-2.12p/debian/changelog
+++ util-linux-2.12p/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.12p-2.0.0.1.pure64) unstable; urgency=low
+
+ * Added workaround to MCONFIG and debian/rules to get rdev build and
+ packaged on amd64 too.
+
+ -- Frederik Sch�ler <[EMAIL PROTECTED]> Wed, 2 Mar 2005 23:33:49 +0100
+
util-linux (2.12p-2) unstable; urgency=low
* Really fix man page in alternatives. Closes: #145647
diff -u util-linux-2.12p/debian/rules util-linux-2.12p/debian/rules
--- util-linux-2.12p/debian/rules
+++ util-linux-2.12p/debian/rules
@@ -17,6 +17,7 @@
version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}'
debian/changelog)
fdisk_arch = $(findstring $(arch),alpha i386 powerpc arm mips mipsel hppa ia64
hurd-i386 amd64)
+rdev_arch = $(findstring $(arch),i386 amd64)
sparc = $(findstring $(arch),sparc)
nohwclock = $(findstring $(arch),s390)
@@ -149,7 +150,7 @@
MAN8FILES := $(MAN8FILES) fdisk/fdisk.8
DOCFILES := $(DOCFILES) fdisk/README.fdisk
endif
-ifeq ($(arch),i386)
+ifeq ($(arch),$(rdev_arch))
USBINFILES:= $(USBINFILES) sys-utils/rdev
MAN8FILES := $(MAN8FILES) sys-utils/{rdev.8,vidmode.8} \
sys-utils/{ramsize.8,rootflags.8}
@@ -173,7 +174,7 @@
install $(UBINFILES2) debian/tmp/usr/bin
ifneq ($(USBINFILES),)
install -s $(USBINFILES) debian/tmp/usr/sbin
-ifeq ($(arch), i386)
+ifeq ($(arch),$(rdev_arch))
ln -s rdev debian/tmp/usr/sbin/ramsize
ln -s rdev debian/tmp/usr/sbin/vidmode
ln -s rdev debian/tmp/usr/sbin/rootflags
diff -u util-linux-2.12p/debian/patches/00list
util-linux-2.12p/debian/patches/00list
--- util-linux-2.12p/debian/patches/00list
+++ util-linux-2.12p/debian/patches/00list
@@ -10,0 +11 @@
+99amd64-rdev.dpatch
only in patch2:
unchanged:
--- util-linux-2.12p.orig/debian/patches/99amd64-rdev.dpatch
+++ util-linux-2.12p/debian/patches/99amd64-rdev.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-amd64-rdev.dpatch by Frederik Sch�ler <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: hacking "architecture detection" to get rdev on amd64 too.
+
[EMAIL PROTECTED]@
+--- util-linux/MCONFIG.old 2005-03-02 23:14:51.424457925 +0100
++++ util-linux/MCONFIG 2005-03-02 23:22:06.749245047 +0100
+@@ -17,7 +17,7 @@
+ # Select for CPU i386 if the binaries must be able to run on an intel 386
+ # (by default i486 code is generated, see below)
+ CPU=$(shell uname -m)
+-ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
++ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/;s/x86_64/intel/')
+
+ # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
+ # will use PAM for authentication. Additionally, passwd will not be
signature.asc
Description: Digital signature
