@@ -86,12 +86,8 @@ endif
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
LIBGLIB2_CONF_OPTS += -Dlibmount=enabled
-ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBS),y)
LIBGLIB2_DEPENDENCIES += util-linux-libs
else
-LIBGLIB2_DEPENDENCIES += util-linux
-endif
-else
LIBGLIB2_CONF_OPTS += -Dlibmount=disabled
endif
@@ -1,5 +1,6 @@
menuconfig BR2_PACKAGE_UTIL_LINUX
bool "util-linux"
+ select BR2_PACKAGE_UTIL_LINUX_LIBS
help
Various useful/essential linux libraries and utilities.
@@ -7,10 +8,13 @@ menuconfig BR2_PACKAGE_UTIL_LINUX
http://www.kernel.org/pub/linux/utils/util-linux/
-if BR2_PACKAGE_UTIL_LINUX
-
config BR2_PACKAGE_UTIL_LINUX_LIBS
- bool
+ bool "util-linux-libs"
+ help
+ Only the libraries provided by util-linux; if you need the
+ tools too, select util-linux.
+
+if BR2_PACKAGE_UTIL_LINUX
config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
bool "libblkid"
When util-linux is enabled, select BR2_PACKAGE_UTIL_LINUX_LIBS as suggested by Yann E. Morin in https://patchwork.ozlabs.org/project/buildroot/patch/20201101121536.1089498-1-fontaine.fabrice@gmail.com/ As a result, drop BR2_PACKAGE_UTIL_LINUX_LIBS workaround from libglib2 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- Changes v1 -> v2: - Drop eudev and systemd updates - Make BR2_PACKAGE_UTIL_LINUX_LIBS a visible option package/libglib2/libglib2.mk | 4 ---- package/util-linux/Config.in | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-)