From d05fc08f90ceb97375a2032a79fd992bf25353cf Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 18 Jan 2021 16:48:21 +0800 Subject: [PATCH] meta-efi-secure-boot/systemd: switch to meson build The systemd switched to meson build long time ago. Somehow this bbappend didn't update. Switch to meson build otherwise these options do not work at all. Signed-off-by: Yi Zhao --- .../recipes-core/systemd/systemd-efi-secure-boot.inc | 5 +++++ .../recipes-core/systemd/systemd_%.bbappend | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 meta-efi-secure-boot/recipes-core/systemd/systemd-efi-secure-boot.inc diff --git a/meta-efi-secure-boot/recipes-core/systemd/systemd-efi-secure-boot.inc b/meta-efi-secure-boot/recipes-core/systemd/systemd-efi-secure-boot.inc new file mode 100644 index 0000000..da6e27b --- /dev/null +++ b/meta-efi-secure-boot/recipes-core/systemd/systemd-efi-secure-boot.inc @@ -0,0 +1,5 @@ +DEPENDS += "gnu-efi" +PACKAGECONFIG_append = " efi" +EXTRA_OEMESON += "-Dgnu-efi=true \ + -Defi-libdir=${STAGING_LIBDIR} \ + -Defi-includedir=${STAGING_INCDIR}" diff --git a/meta-efi-secure-boot/recipes-core/systemd/systemd_%.bbappend b/meta-efi-secure-boot/recipes-core/systemd/systemd_%.bbappend index 665a025..c9e58fd 100644 --- a/meta-efi-secure-boot/recipes-core/systemd/systemd_%.bbappend +++ b/meta-efi-secure-boot/recipes-core/systemd/systemd_%.bbappend @@ -1,9 +1 @@ -DEPENDS += "\ - ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'gnu-efi', '', d)} \ -" - -EXTRA_OECONF += "\ - ${@bb.utils.contains('MACHINE_FEATURES', 'efi', \ - '--enable-efi --enable-gnuefi --with-efi-libdir=${STAGING_LIBDIR} --with-efi-ldsdir=${STAGING_LIBDIR} --with-efi-includedir=${STAGING_INCDIR}', \ - '', d)} \ -" +require ${@bb.utils.contains('DISTRO_FEATURES', 'efi-secure-boot', 'systemd-efi-secure-boot.inc', '', d)}