package/systemd: remove libblkid dependency

this dependency is optional, it is used to
allow udev to add information to blockdevices.
Aslong as MOUNT or FSCK are enabled, it will end up enabled
anyway, but this seems more clear and correct.

Signed-off-by: Norbert Lange <nolange79@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 78a486c0ef28ecc1652372c1b65177a0c4e87790..48790e1494cfa6e9b0fe9a457121f44a2c9eff15 100644 (file)
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -28,7 +28,6 @@ menuconfig BR2_PACKAGE_SYSTEMD
        select BR2_PACKAGE_DBUS # runtime dependency only
        select BR2_PACKAGE_LIBCAP
        select BR2_PACKAGE_UTIL_LINUX
-       select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
        select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
        select BR2_PACKAGE_UTIL_LINUX_BINARIES
        select BR2_PACKAGE_UTIL_LINUX_AGETTY

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 00ab5fd383a570dd8c5a6f9c754197c53f75b0f0..247ead532be82fea7951717c899731ff0aaf63e0 100644 (file)
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -25,7 +25,6 @@ SYSTEMD_CONF_OPTS += \
        -Dsysvinit-path= \
        -Dsysvrcnd-path= \
        -Dutmp=false \
-       -Dblkid=true \
        -Dman=false \
        -Dima=false \
        -Dldconfig=false \
@@ -208,6 +207,12 @@ else
 SYSTEMD_CONF_OPTS += -Dpcre2=false
 endif
 
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
+SYSTEMD_CONF_OPTS += -Dblkid=true
+else
+SYSTEMD_CONF_OPTS += -Dblkid=false
+endif
+
 ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y)
 SYSTEMD_CONF_OPTS += -Dinitrd=true
 else