Am 10.07.2011 05:20, schrieb Michael Biebl: > tags 631468 patch > thanks > > There are two issues here > > 1/ libmount is a linux only feature. Patch 0001 marks the libmount binary > packages linux-any and sets the configure option --enable-libmount-mount only > on > linux
I missed to ifdef a few bits in debian/rules, updated patch attached. Sorry for that. Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From cb6b841e5223dffc9d613f475711247ef629d4b3 Mon Sep 17 00:00:00 2001
From: Michael Biebl <bi...@debian.org>
Date: Sun, 10 Jul 2011 05:14:01 +0200
Subject: [PATCH 1/2] Build libmount on linux only
---
debian/control | 6 +++---
debian/rules | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index a8d87fe..d6d3aa0 100644
--- a/debian/control
+++ b/debian/control
@@ -123,7 +123,7 @@ Package: libmount1
Section: libs
Priority: required
Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: linux-any
Description: block device id library
The device mounting library, used by mount and mount helpers.
@@ -132,7 +132,7 @@ XC-Package-Type: udeb
Section: debian-installer
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: linux-any
Description: block device id library
The device mounting library, used by mount and mount helpers.
.
@@ -142,7 +142,7 @@ Package: libmount-dev
Section: libdevel
Priority: extra
Depends: libc6-dev | libc-dev, libmount1 (= ${binary:Version}), uuid-dev, ${misc:Depends}
-Architecture: any
+Architecture: linux-any
Description: block device id library - headers and static libraries
The device mounting library, used by mount and mount helpers.
.
diff --git a/debian/rules b/debian/rules
index 6759c42..0a3c0b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,9 @@ export arch = $(DEB_HOST_ARCH)
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 --enable-libmount-mount
+CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
ifeq ($(DEB_HOST_ARCH_OS),linux)
-CONFOPTS += --with-selinux
+CONFOPTS += --with-selinux --enable-libmount-mount
endif
build: build-stamp
@@ -127,9 +127,11 @@ endif
install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \
install -m 755 debian/hwclock-set debian/util-linux/lib/udev/hwclock-set; \
fi
+ifeq ($(DEB_HOST_ARCH_OS),linux)
# copy mount library and symlink into udeb
ln debian/libmount1/lib/libmount.so.1.* debian/libmount1-udeb/lib/
ln debian/libmount1/lib/libmount.so.1 debian/libmount1-udeb/lib/
+endif
# copy blkid library and symlink into udeb
ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/
ln debian/libblkid1/lib/libblkid.so.1 debian/libblkid1-udeb/lib/
--
1.7.5.4
signature.asc
Description: OpenPGP digital signature
