Merge branch 'virtual-uuid-blkid' into work/merge

19 files changed, 312 insertions, 52 deletions

diff --git a/platforms/hosttools.in b/platforms/hosttools.in
index 0b31ccd4e..c8a1fb16d 100644
--- a/platforms/hosttools.in
+++ b/platforms/hosttools.in
@@ -6,12 +6,16 @@ source "rules/host-cramfs.in"
 source "rules/host-e2fsprogs.in"
 source "rules/host-genext2fs.in"
 source "rules/host-genpart.in"
+source "rules/host-gettext.in"
+source "rules/host-libblkid.in"
 source "rules/host-libbz2.in"
 source "rules/host-libcap.in"
 source "rules/host-liblzo.in"
+source "rules/host-libuuid.in"
 source "rules/host-mkelfImage.in"
 source "rules/host-mtd-utils.in"
 source "rules/host-squashfs-tools.in"
 source "rules/host-umkimage.in"
+source "rules/host-util-linux-ng.in"
 source "rules/host-xz.in"
 source "rules/host-zlib.in"
diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in
index 825d2871c..4fc989910 100644
--- a/rules/e2fsprogs.in
+++ b/rules/e2fsprogs.in
@@ -4,6 +4,8 @@ menuconfig E2FSPROGS
 	tristate
 	prompt "e2fsprogs                     "
 	select HOST_GETTEXT
+	select LIBBLKID	if E2FSPROGS_LIBBLKID
+	select LIBUUID	if E2FSPROGS_LIBUUID
 	help
 	 The e2fsprogs package provides the filesystem utilities for use
 	 with the ext2 filesystem. It also supports the ext3 filesystem
@@ -105,13 +107,6 @@ config E2FSPROGS_INSTALL_LSATTR
 	help
 	  Enable support for lsattr program.
 
-config E2FSPROGS_INSTALL_UUIDGEN
-	bool
-	select E2FSPROGS_LIBUUID
-	prompt "uuidgen"
-	help
-	  Enable support for uuidgen program.
-
 # -----
 
 config E2FSPROGS_INSTALL_BADBLOCKS
@@ -122,15 +117,6 @@ config E2FSPROGS_INSTALL_BADBLOCKS
 	help
 	  Enable support for badblocks program.
 
-config E2FSPROGS_INSTALL_BLKID
-	bool
-	select E2FSPROGS_LIBBLKID
-	select E2FSPROGS_LIBCOM_ERR
-	select E2FSPROGS_LIBEXT2FS
-	select E2FSPROGS_LIBUUID
-	prompt "blkid"
-	help
-	  Enable support for blkid program.
 
 config E2FSPROGS_INSTALL_DUMPE2FS
 	bool
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index f8079bd2b..36fd6c7aa 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \
 	--disable-testio-debug \
 	--disable-tls \
 	--enable-elf-shlibs \
-	--enable-htree
+	--enable-htree \
+	--disable-libblkid \
+	--disable-libuuid
 
 ifdef PTXCONF_E2FSPROGS_COMPRESSION
 E2FSPROGS_AUTOCONF += --enable-compression
@@ -109,12 +111,6 @@ $(STATEDIR)/e2fsprogs.targetinstall:
 #	#
 #	# libraries
 #	#
-ifdef PTXCONF_E2FSPROGS_LIBBLKID
-	@$(call install_copy, e2fsprogs, 0, 0, 0644, -, \
-		/usr/lib/libblkid.so.1.0)
-	@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1)
-	@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so)
-endif
 
 ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR
 	@$(call install_copy, e2fsprogs, 0, 0, 0644, -, \
@@ -144,14 +140,6 @@ ifdef PTXCONF_E2FSPROGS_LIBSS
 	@$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so)
 endif
 
-ifdef PTXCONF_E2FSPROGS_LIBUUID
-	@$(call install_copy, e2fsprogs, 0, 0, 0644, -, \
-		/usr/lib/libuuid.so.1.2)
-	@$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1)
-	@$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so)
-endif
-
-
 #	#
 #	# binaries in /usr/bin
 #	#
@@ -161,9 +149,6 @@ endif
 ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR
 	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen)
-endif
 
 
 #	#
@@ -173,10 +158,6 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS
 	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks)
 endif
 
-ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid)
-endif
-
 ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS
 	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs)
 endif
diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in
new file mode 100644
index 000000000..31490b764
--- /dev/null
+++ b/rules/host-libblkid.in
@@ -0,0 +1,12 @@
+## SECTION=hosttools_noprompt
+
+config HOST_LIBBLKID
+	tristate
+	select HOST_UTIL_LINUX_NG
+	help
+	  Helper to select the host packet containing a recent libblkid.so
+	  library and its header.
+	  
+	  The following packages provide libblkid:
+	  - e2fsprogs      (older version)
+	  - utils-linux-ng (more recent version)
diff --git a/rules/host-libblkid.make b/rules/host-libblkid.make
new file mode 100644
index 000000000..a1b58b525
--- /dev/null
+++ b/rules/host-libblkid.make
@@ -0,0 +1,37 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Carsten Schlote <c.schlote@konzeptpark.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBBLKID) += host-libblkid
+
+# ----------------------------------------------------------------------------
+# Virtual fake package
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-libblkid.get:
+	@$(call touch)
+
+$(STATEDIR)/host-libblkid.extract:
+	@$(call touch)
+
+$(STATEDIR)/host-libblkid.prepare:
+	@$(call touch)
+
+$(STATEDIR)/host-libblkid.compile:
+	@$(call touch)
+
+$(STATEDIR)/host-libblkid.install:
+	@$(call targetinfo)
+	@$(call touch)
+
+
+# vim: syntax=make
diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in
new file mode 100644
index 000000000..f88e79f58
--- /dev/null
+++ b/rules/host-libuuid.in
@@ -0,0 +1,12 @@
+## SECTION=hosttools_noprompt
+
+config HOST_LIBUUID
+	tristate
+	select HOST_UTIL_LINUX_NG
+	help
+	  Helper to select the host packet containing a recent libuuid.so
+	  library and its header.
+	  
+	  The following packages provide libuuid:
+	  - e2fsprogs      (older version)
+	  - utils-linux-ng (more recent version)
diff --git a/rules/host-libuuid.make b/rules/host-libuuid.make
new file mode 100644
index 000000000..8c836cfbf
--- /dev/null
+++ b/rules/host-libuuid.make
@@ -0,0 +1,37 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Carsten Schlote <c.schlote@konzeptpark.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBUUID) += host-libuuid
+
+# ----------------------------------------------------------------------------
+# Virtual fake package
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-libuuid.get:
+	@$(call touch)
+
+$(STATEDIR)/host-libuuid.extract:
+	@$(call touch)
+
+$(STATEDIR)/host-libuuid.prepare:
+	@$(call touch)
+
+$(STATEDIR)/host-libuuid.compile:
+	@$(call touch)
+
+$(STATEDIR)/host-libuuid.install:
+	@$(call targetinfo)
+	@$(call touch)
+
+
+# vim: syntax=make
diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in
index 2e501c043..9636aea84 100644
--- a/rules/host-mtd-utils.in
+++ b/rules/host-mtd-utils.in
@@ -4,4 +4,4 @@ config HOST_MTD_UTILS
 	tristate
 	select HOST_LIBLZO
 	select HOST_ZLIB
-	select HOST_E2FSPROGS
+	select HOST_LIBUUID
diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in
new file mode 100644
index 000000000..12f2d573a
--- /dev/null
+++ b/rules/host-util-linux-ng.in
@@ -0,0 +1,7 @@
+## SECTION=hosttools_noprompt
+
+config HOST_UTIL_LINUX_NG
+	tristate
+	select HOST_GETTEXT
+	help
+	  Useful hosttools and libs for linux ng utils.
diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make
new file mode 100644
index 000000000..166683cf9
--- /dev/null
+++ b/rules/host-util-linux-ng.make
@@ -0,0 +1,42 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Carsten Schlote <c.schlote@konzeptpark.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX_NG) += host-util-linux-ng
+
+#
+# Paths and names
+#
+HOST_UTIL_LINUX_NG_DIR	= $(HOST_BUILDDIR)/$(UTIL_LINUX_NG)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-util-linux-ng.get: $(STATEDIR)/util-linux-ng.get
+	@$(call targetinfo)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+
+HOST_UTIL_LINUX_NG_AUTOCONF := \
+	$(HOST_AUTOCONF) \
+	--disable-use-tty-group \
+	--disable-makeinstall-chown
+
+# vim: syntax=make
diff --git a/rules/libblkid.in b/rules/libblkid.in
new file mode 100644
index 000000000..0e2106f17
--- /dev/null
+++ b/rules/libblkid.in
@@ -0,0 +1,14 @@
+## SECTION=system_libraries
+
+config LIBBLKID
+	tristate
+	select LIBUUID
+	select UTIL_LINUX_NG
+	select UTIL_LINUX_NG_LIBBLKID
+	help
+	  Helper to select the target packet containing a recent libblkid.so
+	  library and its header.
+	  
+	  The following packages provide libblkid:
+	  - e2fsprogs      (older version)
+	  - utils-linux-ng (more recent version)
diff --git a/rules/libblkid.make b/rules/libblkid.make
new file mode 100644
index 000000000..d9553f991
--- /dev/null
+++ b/rules/libblkid.make
@@ -0,0 +1,40 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Carsten Schlote <c.schlote@konzeptpark.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBBLKID) += libblkid
+
+# ----------------------------------------------------------------------------
+# Virtual fake package
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libblkid.get:
+	@$(call touch)
+
+$(STATEDIR)/libblkid.extract:
+	@$(call touch)
+
+$(STATEDIR)/libblkid.prepare:
+	@$(call touch)
+
+$(STATEDIR)/libblkid.compile:
+	@$(call touch)
+
+$(STATEDIR)/libblkid.install:
+	@$(call targetinfo)
+	@$(call touch)
+
+$(STATEDIR)/libblkid.targetinstall:
+	@$(call touch)
+
+
+# vim: syntax=make
diff --git a/rules/libuuid.in b/rules/libuuid.in
new file mode 100644
index 000000000..31bb8a243
--- /dev/null
+++ b/rules/libuuid.in
@@ -0,0 +1,13 @@
+## SECTION=system_libraries
+
+config LIBUUID
+	tristate
+	select UTIL_LINUX_NG
+	select UTIL_LINUX_NG_LIBUUID
+	help
+	  Helper to select the target packet containing a recent libuuid.so
+	  library and its header.
+	  
+	  The following packages provide libuuid:
+	  - e2fsprogs      (older version)
+	  - utils-linux-ng (more recent version)
diff --git a/rules/libuuid.make b/rules/libuuid.make
new file mode 100644
index 000000000..1109fd460
--- /dev/null
+++ b/rules/libuuid.make
@@ -0,0 +1,39 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Carsten Schlote <c.schlote@konzeptpark.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBUUID) += libuuid
+
+# ----------------------------------------------------------------------------
+# Virtual fake package
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libuuid.get:
+	@$(call touch)
+
+$(STATEDIR)/libuuid.extract:
+	@$(call touch)
+
+$(STATEDIR)/libuuid.prepare:
+	@$(call touch)
+
+$(STATEDIR)/libuuid.compile:
+	@$(call touch)
+
+$(STATEDIR)/libuuid.install:
+	@$(call targetinfo)
+	@$(call touch)
+
+$(STATEDIR)/libuuid.targetinstall:
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 7caad2e1a..6ca5513ad 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 94b7163c4..744a03dcb 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 09f7c2db8..b24c1b3d6 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
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index da3d749f0..eacd4050f 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -4,16 +4,19 @@ menuconfig UTIL_LINUX_NG
 	tristate
 	prompt "util-linux-ng                 "
 	select HOST_GETTEXT
-	# select LIBC_UTIL
-	# we may need libuuid from E2FSPROGS, but we always need blkid
-	select E2FSPROGS
-	select E2FSPROGS_LIBBLKID
-	select E2FSPROGS_LIBUUID	if UTIL_LINUX_NG_MKSWAP_UUID
-	select NCURSES			if UTIL_LINUX_NG_USES_NCURSES
-	select UTIL_LINUX_NG_USES_NCURSES if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM
+	select UTIL_LINUX_NG_LIBBLKID
+	select UTIL_LINUX_NG_LIBUUID		if UTIL_LINUX_NG_MKSWAP_UUID
+	select NCURSES				if UTIL_LINUX_NG_USES_NCURSES
+	select UTIL_LINUX_NG_USES_NCURSES 	if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM
 
 if UTIL_LINUX_NG
 
+config UTIL_LINUX_NG_LIBBLKID
+	bool
+
+config UTIL_LINUX_NG_LIBUUID
+	bool
+
 config UTIL_LINUX_NG_USES_NCURSES
 	bool
 
@@ -154,4 +157,20 @@ config UTIL_LINUX_NG_MCOOKIE
 	  mcookie generates a 128-bit random hexadecimal number for
 	  use with the X authority system.
 
+config UTIL_LINUX_NG_INSTALL_UUIDGEN
+	bool
+	select UTIL_LINUX_NG_LIBUUID
+	prompt "uuidgen"
+	help
+	  Enable support for uuidgen program.
+
+config UTIL_LINUX_NG_INSTALL_BLKID
+	bool
+	select UTIL_LINUX_NG_LIBBLKID
+	select UTIL_LINUX_NG_LIBUUID
+	prompt "blkid"
+	help
+	  Enable support for blkid program.
+
+
 endif
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 4727a707f..12aa44449 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -146,6 +146,26 @@ ifdef PTXCONF_UTIL_LINUX_NG_MCOOKIE
 	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mcookie)
 endif
 
+ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID
+	@$(call install_copy, util-linux-ng, 0, 0, 0644, -, /lib/libblkid.so.1.1.0)
+	@$(call install_link, util-linux-ng, libblkid.so.1.1.0, /lib/libblkid.so.1)
+	@$(call install_link, util-linux-ng, libblkid.so.1.1.0, /lib/libblkid.so)
+endif
+
+ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_BLKID
+	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/blkid)
+endif
+
+ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID
+	@$(call install_copy, util-linux-ng, 0, 0, 0644, -, /lib/libuuid.so.1.3.0)
+	@$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so.1)
+	@$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so)
+endif
+
+ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_UUIDGEN
+	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen)
+endif
+
 	@$(call install_finish, util-linux-ng)
 
 	@$(call touch)