From 5ca0214027a65f212b2a745d8ab1d9a5d65a7eec Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Fri, 31 Jul 2020 23:53:42 +0200 Subject: [PATCH] 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 Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 1 - package/systemd/systemd.mk | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 78a486c0ef..48790e1494 100644 --- 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 00ab5fd383..247ead532b 100644 --- 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 -- 2.30.2