From 691a8e0474d482e2487b7ba29818cbb758bdd2b2 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 13 Dec 2021 18:00:02 -0600 Subject: meta-phosphor: cmake packages: add pkgconfig With the latest Yocto we see failures: ``` 17:14:36 | CMake Error at /home/jenkins-op/workspace/ci-openbmc/distro/ubuntu/label/docker-builder/target/tiogapass/build/work/arm1176jzs-openbmc-linux-gnueabi/phosphor-ipmi-ipmb/0.1+gitAUTOINC+8227626764-r0/recipe-sysroot-native/usr/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake:230 (message): 17:14:36 | Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE) ``` Add the correct inherit for ipmb-ipmb. Pre-emptively add for any recipe which does 'inherit cmake'. Signed-off-by: Patrick Williams Change-Id: Ib3327af0f19268d1f5b70259c3445b0985da9fa0 --- meta-phosphor/recipes-support/cjson/cjson_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-support') diff --git a/meta-phosphor/recipes-support/cjson/cjson_git.bb b/meta-phosphor/recipes-support/cjson/cjson_git.bb index 1b83dd1bc..67512ffe9 100644 --- a/meta-phosphor/recipes-support/cjson/cjson_git.bb +++ b/meta-phosphor/recipes-support/cjson/cjson_git.bb @@ -8,7 +8,7 @@ SRCREV = "cbc05de76fbd4dfff17b5626d5cfe9ec922b1f4a" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig FILES:${PN}-dev += "${libdir}/cmake/cJSON/*" -- cgit v1.2.3 From f9b08f806f4712c467c5ab1945f7746e195c0b7d Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Tue, 21 Dec 2021 09:26:54 -0800 Subject: meta-phosphor: gnupg: Remove unneeded gnupg files This saved 49152 bytes of compressed image space in our platform. Signed-off-by: Josh Lehan Signed-off-by: Brandon Kim Change-Id: I4b5b4c7cd2bfffb9720bae02624519ee10ca73af --- meta-google/recipes-support/gnupg/gnupg_%.bbappend | 2 -- meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 meta-google/recipes-support/gnupg/gnupg_%.bbappend create mode 100644 meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend (limited to 'meta-phosphor/recipes-support') diff --git a/meta-google/recipes-support/gnupg/gnupg_%.bbappend b/meta-google/recipes-support/gnupg/gnupg_%.bbappend deleted file mode 100644 index 3f2f4f94f..000000000 --- a/meta-google/recipes-support/gnupg/gnupg_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Remove unneeded gnupg help files to save space -EXTRA_OECONF:append:gbmc = " --disable-doc" diff --git a/meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend b/meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend new file mode 100644 index 000000000..3f2f4f94f --- /dev/null +++ b/meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend @@ -0,0 +1,2 @@ +# Remove unneeded gnupg help files to save space +EXTRA_OECONF:append:gbmc = " --disable-doc" -- cgit v1.2.3