[meta-security][PATCH 1/3] os-release.bbappend: drop now CPE_NAME is in core

[meta-security][PATCH 1/3] os-release.bbappend: drop now CPE_NAME is in core

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-core/os-release/os-release.bbappend                  | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 meta-security-compliance/recipes-core/os-release/os-release.bbappend

diff --git a/meta-security-compliance/recipes-core/os-release/os-release.bbappend b/meta-security-compliance/recipes-core/os-release/os-release.bbappend
deleted file mode 100644
index 604bacb..0000000
--- a/meta-security-compliance/recipes-core/os-release/os-release.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-CPE_NAME="cpe:/o:openembedded:nodistro:0"
-- 
2.25.1

[meta-security][PATCH 2/3] openembedded-release: drop as os-release does this now

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../openembedded-release_1.0.bb               | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb

diff --git a/meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb b/meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb
deleted file mode 100644
index 0ad427d..0000000
--- a/meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-inherit allarch
-
-SUMMARY = "Operating release identification"
-DESCRIPTION = "The /etc/openembedded-release file contains operating system identification data."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-INHIBIT_DEFAULT_DEPS = "1"
-
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
-do_configure[noexec] = "1"
-
-VERSION = "0"
-RELEASE_NAME = "${DISTRO_NAME} ${DISTRO} ${VERSION}"
-
-def sanitise_version(ver):
-    ret = ver.replace('+', '-').replace(' ','_')
-    return ret.lower()
-
-python do_compile () {
-    import shutil
-    release_name = d.getVar('RELEASE_NAME')		 
-    with open(d.expand('${B}/openemebedded-release'), 'w') as f:
-        f.write('%s\n' % release_name)
-}
-do_compile[vardeps] += "${RELEASE_NAME}"
-
-do_install () {
-    install -d ${D}${sysconfdir}
-    install -m 0644 openemebedded-release ${D}${sysconfdir}/
-}
-- 
2.25.1

[meta-security][PATCH 3/3] tpm2-tss: drop vendor from PACKAGECONFIG

[Armin Kuster]

fixes:
WARNING: tpm2-tss-4.0.1-r0 do_configure: QA Issue: tpm2-tss: invalid PACKAGECONFIG: vendor [invalid-packageconfig]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb
index cc7e6ae..6386105 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb
@@ -18,7 +18,7 @@ CVE_PRODUCT = "tpm2_software_stack"
 
 inherit autotools pkgconfig systemd useradd
 
-PACKAGECONFIG ??= "vendor"
+PACKAGECONFIG ??= ""
 PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, "
 PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,curl json-c util-linux-libuuid "
 PACKAGECONFIG[policy] = "--enable-policy,--disable-policy,json-c util-linux-libuuid "
-- 
2.25.1