summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-21 11:57:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-21 21:52:59 +0100
commit58ab85d3e005476ab5bcc288ad421c0c5d1e0582 (patch)
treeb2b1bf2adbbccd84f285f2b2d23f4b5a453edfe9
parentfbd9c8b42762062d163403fdcc59e6875f956d88 (diff)
downloadopenembedded-core-contrib-58ab85d3e005476ab5bcc288ad421c0c5d1e0582.tar.gz
openembedded-core-contrib-58ab85d3e005476ab5bcc288ad421c0c5d1e0582.tar.bz2
openembedded-core-contrib-58ab85d3e005476ab5bcc288ad421c0c5d1e0582.zip
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb1
1 files changed, 1 insertions, 0 deletions
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