From 58ab85d3e005476ab5bcc288ad421c0c5d1e0582 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 21 Aug 2019 11:57:03 +0100 Subject: systemd: add PACKAGECONFIG for gnu-efi Add a PACKAGECONFIG for gnu-efi, by default the meson.build looks explicitly in /usr/include and /usr/lib for gnu-efi, and if it is present on the host the build will fail. [ YOCTO #13487 ] Original patch by Chin Huat Ang. (From OE-Core rev: 050cda9f02c6a5c773edf092514b173839569a48) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_242.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index 6992062cef..b368ca8a2c 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb @@ -126,6 +126,7 @@ PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup" PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus" PACKAGECONFIG[efi] = "-Defi=true,-Defi=false" +PACKAGECONFIG[gnu-efi] = "-Dgnu-efi=true -Defi-libdir=${STAGING_LIBDIR} -Defi-includedir=${STAGING_INCDIR}/efi,-Dgnu-efi=false,gnu-efi" PACKAGECONFIG[elfutils] = "-Delfutils=true,-Delfutils=false,elfutils" PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false" # Sign the journal for anti-tampering -- cgit 1.2.3-korg