util-linux-ng: add uuidd and cleanup configure options

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 48 insertions, 16 deletions

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index ac503afa8..da1c15c16 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -235,6 +235,16 @@ config UTIL_LINUX_NG_MCOOKIE
 	  mcookie generates a 128-bit random hexadecimal number for
 	  use with the X authority system.
 
+config UTIL_LINUX_NG_UUIDD
+	bool
+	select UTIL_LINUX_NG_LIBUUID
+	prompt "uuidd"
+	help
+	  The  uuidd  daemon  is  used by the UUID library to generate
+	  universally unique identifiers (UUIDs), especially time-based UUIDs,
+	  in a secure and guaranteed- unique fashion, even in the face of large
+	  numbers of threads running on different CPUs trying to grab UUIDs.
+
 config UTIL_LINUX_NG_UUIDGEN
 	bool
 	select UTIL_LINUX_NG_LIBUUID
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index ed71716cf..d9a36510d 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -45,45 +45,56 @@ UTIL_LINUX_NG_ENV 	:= \
 #
 UTIL_LINUX_NG_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
 	--enable-shared \
-	--enable-static \
+	--disable-static \
+	--disable-gtk-doc \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-tls \
+	--enable-mount \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_UUIDD)-uuidd \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
+	--disable-libmount-mount \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNTPOINT)-mountpoint \
 	--disable-nls \
 	--disable-rpath \
 	--disable-arch \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_DDATE)-ddate \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
 	--disable-cramfs \
-	--disable-elvtune \
+	--disable-switch_root \
+	--disable-pivot_root \
 	--disable-fallocate \
+	--disable-unshare \
+	--disable-elvtune \
 	--disable-kill \
 	--disable-last \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LINE)-line \
 	--disable-mesg \
 	--disable-raw \
 	--disable-rename \
 	--disable-reset \
-	--enable-schedutils \
 	--disable-login-utils \
+	--enable-schedutils \
 	--disable-wall \
 	--disable-write \
 	--disable-chsh-only-listed \
 	--disable-login-chown-vcs \
 	--disable-login-stat-mail \
-	--disable-makeinstall-chown \
 	--disable-pg-bell \
 	--disable-require-password \
 	--disable-use-tty-group \
-	--without-pam \
+	--disable-makeinstall-chown \
+	--disable-makeinstall-setuid \
+	--$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
 	--without-slang \
-	--without-selinux \
-	--without-audit \
 	--without-utempter \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LINE)-line \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_DDATE)-ddate \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNTPOINT)-mountpoint \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid
+	--without-pam \
+	--without-selinux \
+	--without-audit
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -180,6 +191,9 @@ endif
 ifdef PTXCONF_UTIL_LINUX_NG_LIBMOUNT
 	@$(call install_lib, util-linux-ng, 0, 0, 0644, libmount)
 endif
+ifdef PTXCONF_UTIL_LINUX_NG_UUIDD
+	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/uuidd)
+endif
 ifdef PTXCONF_UTIL_LINUX_NG_UUIDGEN
 	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen)
 endif
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 896959aa1..d8c4f491f 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -145,3 +145,11 @@ s/^\(\(# \)\?PTXCONF_BLUEZ\)_LIBS/\1/
 #
 s/^\(\(# \)\?PTXCONF_OWFS_\)_\(.*$\)/\1\3/
 
+#
+# from   : ptxdist-2011.02.0
+# to     : ptxdist-2011.03.0
+# symbol : E2FSPROGS_INSTALL_UUIDD	-> UTIL_LINUX_NG_UUIDD
+# reason : uuidd is now provided by util-linux
+#
+s/^\(\(# \)\?PTXCONF_\)E2FSPROGS_INSTALL\(_UUIDD\)/\1UTIL_LINUX_NG\3/
+