2
1
Эх сурвалжийг харах

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>
Norbert Lange 5 жил өмнө
parent
commit
5ca0214027

+ 0 - 1
package/systemd/Config.in

@@ -28,7 +28,6 @@ menuconfig BR2_PACKAGE_SYSTEMD
 	select BR2_PACKAGE_DBUS # runtime dependency only
 	select BR2_PACKAGE_DBUS # runtime dependency only
 	select BR2_PACKAGE_LIBCAP
 	select BR2_PACKAGE_LIBCAP
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_UTIL_LINUX_BINARIES
 	select BR2_PACKAGE_UTIL_LINUX_BINARIES
 	select BR2_PACKAGE_UTIL_LINUX_AGETTY
 	select BR2_PACKAGE_UTIL_LINUX_AGETTY

+ 6 - 1
package/systemd/systemd.mk

@@ -25,7 +25,6 @@ SYSTEMD_CONF_OPTS += \
 	-Dsysvinit-path= \
 	-Dsysvinit-path= \
 	-Dsysvrcnd-path= \
 	-Dsysvrcnd-path= \
 	-Dutmp=false \
 	-Dutmp=false \
-	-Dblkid=true \
 	-Dman=false \
 	-Dman=false \
 	-Dima=false \
 	-Dima=false \
 	-Dldconfig=false \
 	-Dldconfig=false \
@@ -208,6 +207,12 @@ else
 SYSTEMD_CONF_OPTS += -Dpcre2=false
 SYSTEMD_CONF_OPTS += -Dpcre2=false
 endif
 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)
 ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y)
 SYSTEMD_CONF_OPTS += -Dinitrd=true
 SYSTEMD_CONF_OPTS += -Dinitrd=true
 else
 else