util-linux: fix partx build breakage

addpart, delpart and partx are enabled by default so --disable now to
avoid build breaking when we lack libblkid.
Also select libblkid when it's enabled now.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 816130dafa167b77f4f3dbe210c74bd5f622a216..43a84440ffcb92a7b08c061670439260d38988b2 100644 (file)
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -67,6 +67,10 @@ config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
 config BR2_PACKAGE_UTIL_LINUX_WALL
        bool "build \"wall\""
 
+config BR2_PACKAGE_UTIL_LINUX_PARTX
+       bool "build \"addpart, delpart, partx\""
+       select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+
 ############################################
 # default disabled and should be enabled by
 #  --enable-foo
@@ -86,9 +90,6 @@ config BR2_PACKAGE_UTIL_LINUX_LAST
 config BR2_PACKAGE_UTIL_LINUX_MESG
        bool "build \"mesg\""
 
-config BR2_PACKAGE_UTIL_LINUX_PARTX
-       bool "build \"addpart, delpart, partx\""
-
 config BR2_PACKAGE_UTIL_LINUX_RAW
        bool "build \"raw\""
 

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index b77e326f07674da9958c0098b5b7a68235eb6c5f..a3d6e139cdb416828c689378601c66bf845ab93e 100644 (file)
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -49,7 +49,8 @@ UTIL_LINUX_CONF_OPT += \
        $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),,--disable-unshare) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),,--disable-rename) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),,--disable-schedutils) \
-       $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall)
+       $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall) \
+       $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx)
 
 #############################################
 #
@@ -61,7 +62,6 @@ UTIL_LINUX_CONF_OPT += \
        $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg) \
-       $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \