From: Carsten Schlote <c.schl...@konzeptpark.de>
util-linux-ng provides newer versions of libblkid and libuuid
than the e2fsprogs sources do.
This patch prepares transition by redirecting
selects for libuuid or libblkid to virtual
packages.
Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
Acked-by: Marc Kleine-Budde <m...@pengutronix.de>
---
rules/mtd-utils.in | 2 +-
rules/networkmanager.in | 4 +---
rules/nfsutils.in | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 7caad2e..6ca5513 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -4,7 +4,7 @@ menuconfig MTD_UTILS
tristate
prompt "mtd-utils "
select ZLIB
- select E2FSPROGS
+ select LIBUUID
select LIBLZO if MTD_UTILS_USE_LIBLZO
help
Memory Technology Device Utilities
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 94b7163..744a03d 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -6,9 +6,7 @@ config NETWORKMANAGER
select WIRELESS
select DBUS_GLIB
select LIBNL
- # we need libuuid from e2fsprogs
- select E2FSPROGS
- select E2FSPROGS_LIBUUID
+ select LIBUUID
# FIXME: hal can be configured without policy-kit, but networkmanager
depends on it
select HAL
select HAL__POLKIT
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index 09f7c2d..b24c1b3 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -2,8 +2,7 @@
menuconfig NFSUTILS
tristate
# we need libblkid
- select E2FSPROGS
- select E2FSPROGS_LIBBLKID
+ select LIBBLKID
select TCPWRAPPER if NFSUTILS_WITH_TCPWRAPPERS
prompt "nfsutils "
help
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
