mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/systemd: add separate EFI support option

Browse Source 
In the current systemd package, EFI support is tied to enabling
systemd-boot, but there are some use cases where EFI support is
desired, independently of systemd-boot, for example to mount
automatically efivarfs in /sys/firmware/efi/efivars.

This commit therefore adds a separate option to enable EFI support.

Signed-off-by: Guillaume GC. Chaye <guillaume.chaye@zeetim.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Guillaume GC. Chaye
2024-09-11 14:20:10 +02:00
committed by Thomas Petazzoni
parent 489e38fd2c
commit dd35dd09ca
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/systemd/Config.in
View File

@@ -113,6 +113,7 @@ config BR2_PACKAGE_SYSTEMD_BOOT
bool "systemd-boot" bool "systemd-boot"
depends on BR2_i386 || BR2_x86_64 depends on BR2_i386 || BR2_x86_64
select BR2_PACKAGE_GNU_EFI select BR2_PACKAGE_GNU_EFI
select BR2_PACKAGE_SYSTEMD_EFI
help help
systemd-boot is a simple UEFI boot manager which executes systemd-boot is a simple UEFI boot manager which executes
configured EFI images. The default entry is selected by a configured EFI images. The default entry is selected by a
@@ -161,6 +162,9 @@ config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH
default "x64" if BR2_x86_64 default "x64" if BR2_x86_64
depends on BR2_PACKAGE_SYSTEMD_BOOT depends on BR2_PACKAGE_SYSTEMD_BOOT
config BR2_PACKAGE_SYSTEMD_EFI
bool "enable EFI support"
config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE
bool "enable journal remote tools" bool "enable journal remote tools"
select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBCURL

10
package/systemd/systemd.mk
View File

@@ -647,7 +647,7 @@ endif
ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y) ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y)
SYSTEMD_INSTALL_IMAGES = YES SYSTEMD_INSTALL_IMAGES = YES
SYSTEMD_DEPENDENCIES += gnu-efi host-python-pyelftools SYSTEMD_DEPENDENCIES += gnu-efi host-python-pyelftools
SYSTEMD_CONF_OPTS += -Defi=true -Dbootloader=enabled SYSTEMD_CONF_OPTS += -Dbootloader=enabled
SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH)) SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH))
define SYSTEMD_INSTALL_BOOT_FILES define SYSTEMD_INSTALL_BOOT_FILES
@@ -660,9 +660,15 @@ define SYSTEMD_INSTALL_BOOT_FILES
endef endef
else else
SYSTEMD_CONF_OPTS += -Defi=false -Dbootloader=disabled SYSTEMD_CONF_OPTS += -Dbootloader=disabled
endif # BR2_PACKAGE_SYSTEMD_BOOT == y endif # BR2_PACKAGE_SYSTEMD_BOOT == y
ifeq ($(BR2_PACKAGE_SYSTEMD_EFI),y)
SYSTEMD_CONF_OPTS += -Defi=true
else
SYSTEMD_CONF_OPTS += -Defi=false
endif
SYSTEMD_FALLBACK_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) SYSTEMD_FALLBACK_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),)
SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME)