[ptxdist] (2/4) Switch to newer versions of libuuid and libblkid

util-linux-ng provides newer versions of libblkid and libuuid
than the e2fsprogs sources do.

This patch modifies e2fsprogs and util-linux-ng:
- Disable compilation of built-in libs in
  e2fsprogs
- Remove selects for e2fsprogs from utils-linux-ng
- Moved installtion of libs to ng-utils
- Commented out blkid and uuidgen from e2fsprogs
  to avoid collisions.

Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
Acked-by: Marc Kleine-Budde <mkl@penguttronix.de>

Update: Fixed packet name for install_copy. Now uuidgen and blkid get
installed correctly. I forgot to change that after CCP from e2fstools.

Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>

4 files changed, 51 insertions, 45 deletions

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/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)