mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/systemd: remove libblkid dependency

Browse Source 
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>
This commit is contained in:
Norbert Lange
2020-07-31 23:53:42 +02:00
committed by Thomas Petazzoni
parent aa7a165a3d
commit 5ca0214027
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/systemd/Config.in
View File

@@ -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

7
package/systemd/systemd.mk
View File

@@ -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