Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCHv2 1/1] package/systemd: add EFI support option
@ 2024-09-11 12:07 Guillaume GC. Chaye
  0 siblings, 0 replies; 3+ messages in thread
From: Guillaume GC. Chaye @ 2024-09-11 12:07 UTC (permalink / raw)
  To: buildroot
  Cc: Norbert Lange, Guillaume GC. Chaye, Sen Hastings, Yann E . MORIN

We need to compile systemd with -Defi=true flag to mount automatically
efivarfs in /sys/firmware/efi/efivars

Signed-off-by: Guillaume GC. Chaye <guillaume.chaye@zeetim.com>
---
 package/systemd/Config.in  |  4 ++++
 package/systemd/systemd.mk | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 345f08590e..6b695c40c9 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -113,6 +113,7 @@ config BR2_PACKAGE_SYSTEMD_BOOT
 	bool "systemd-boot"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_PACKAGE_GNU_EFI
+	select BR2_PACKAGE_SYSTEMD_EFI
 	help
 	  systemd-boot is a simple UEFI boot manager which executes
 	  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
 	depends on BR2_PACKAGE_SYSTEMD_BOOT
 
+config BR2_PACKAGE_SYSTEMD_EFI
+	bool "enable EFI support"
+
 config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE
 	bool "enable journal remote tools"
 	select BR2_PACKAGE_LIBCURL
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 5dca8681bc..e2d0bba96e 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -647,7 +647,7 @@ endif
 ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y)
 SYSTEMD_INSTALL_IMAGES = YES
 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))
 define SYSTEMD_INSTALL_BOOT_FILES
@@ -660,9 +660,15 @@ define SYSTEMD_INSTALL_BOOT_FILES
 endef
 
 else
-SYSTEMD_CONF_OPTS += -Defi=false -Dbootloader=disabled
+SYSTEMD_CONF_OPTS += -Dbootloader=disabled
 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))
 ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),)
 SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME)
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCHv2 1/1] package/systemd: add EFI support option
@ 2024-09-11 12:20 Guillaume GC. Chaye
  2024-10-29 22:10 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 3+ messages in thread
From: Guillaume GC. Chaye @ 2024-09-11 12:20 UTC (permalink / raw)
  To: buildroot
  Cc: Norbert Lange, Guillaume GC. Chaye, Sen Hastings, Yann E . MORIN

We need to compile systemd with -Defi=true flag to mount automatically
efivarfs in /sys/firmware/efi/efivars

Signed-off-by: Guillaume GC. Chaye <guillaume.chaye@zeetim.com>
---
 package/systemd/Config.in  |  4 ++++
 package/systemd/systemd.mk | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 345f08590e..6b695c40c9 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -113,6 +113,7 @@ config BR2_PACKAGE_SYSTEMD_BOOT
 	bool "systemd-boot"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_PACKAGE_GNU_EFI
+	select BR2_PACKAGE_SYSTEMD_EFI
 	help
 	  systemd-boot is a simple UEFI boot manager which executes
 	  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
 	depends on BR2_PACKAGE_SYSTEMD_BOOT
 
+config BR2_PACKAGE_SYSTEMD_EFI
+	bool "enable EFI support"
+
 config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE
 	bool "enable journal remote tools"
 	select BR2_PACKAGE_LIBCURL
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 5dca8681bc..e2d0bba96e 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -647,7 +647,7 @@ endif
 ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y)
 SYSTEMD_INSTALL_IMAGES = YES
 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))
 define SYSTEMD_INSTALL_BOOT_FILES
@@ -660,9 +660,15 @@ define SYSTEMD_INSTALL_BOOT_FILES
 endef
 
 else
-SYSTEMD_CONF_OPTS += -Defi=false -Dbootloader=disabled
+SYSTEMD_CONF_OPTS += -Dbootloader=disabled
 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))
 ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),)
 SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME)
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCHv2 1/1] package/systemd: add EFI support option
  2024-09-11 12:20 [Buildroot] [PATCHv2 1/1] package/systemd: add EFI support option Guillaume GC. Chaye
@ 2024-10-29 22:10 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-10-29 22:10 UTC (permalink / raw)
  To: Guillaume GC. Chaye
  Cc: buildroot, Norbert Lange, Sen Hastings, Yann E . MORIN

Hello Guillaume,

On Wed, 11 Sep 2024 14:20:10 +0200
"Guillaume GC. Chaye" <guillaume.chaye@zeetim.com> wrote:

> We need to compile systemd with -Defi=true flag to mount automatically
> efivarfs in /sys/firmware/efi/efivars
> 
> Signed-off-by: Guillaume GC. Chaye <guillaume.chaye@zeetim.com>
> ---
>  package/systemd/Config.in  |  4 ++++
>  package/systemd/systemd.mk | 10 ++++++++--
>  2 files changed, 12 insertions(+), 2 deletions(-)

Applied to master with a slightly improved commit message. An improved
commit message would have helped in getting your patch merged faster,
by providing a clearer explanation of what you're trying to fix, and
how.

Thanks for your contribution!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-29 22:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-11 12:20 [Buildroot] [PATCHv2 1/1] package/systemd: add EFI support option Guillaume GC. Chaye
2024-10-29 22:10 ` Thomas Petazzoni via buildroot
  -- strict thread matches above, loose matches on Subject: below --
2024-09-11 12:07 Guillaume GC. Chaye

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox