From ea5e2ad93013754f78b4a55103cd43d154e73418 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 17 May 2023 13:24:54 -0400 Subject: layer.conf: Insert addpylib declaration Yocto mickledore introduced the addpylib directive for explicitly adding layer paths to the PYTHONPATH. Standalone OEQA test suite discovery does not require this directive but it is required to import test cases from other layers, e.g. to extend and modify the test cases. Signed-off-by: Armin Kuster --- conf/layer.conf | 1 + meta-integrity/conf/layer.conf | 2 ++ meta-security-compliance/conf/layer.conf | 2 ++ meta-security-isafw/conf/layer.conf | 2 ++ meta-tpm/conf/layer.conf | 2 ++ 5 files changed, 9 insertions(+) diff --git a/conf/layer.conf b/conf/layer.conf index b5a74f1..334a945 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -28,3 +28,4 @@ INHERIT += "sanity-meta-security" QB_KERNEL_CMDLINE_APPEND = " ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', 'apparmor=1 security=apparmor', '', d)}" +addpylib ${LAYERDIR}/lib oeqa diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf index b273b5b..0622a5f 100644 --- a/meta-integrity/conf/layer.conf +++ b/meta-integrity/conf/layer.conf @@ -33,3 +33,5 @@ INHERIT += "sanity-meta-integrity" BBFILES_DYNAMIC += " \ networking-layer:${LAYERDIR}/dynamic-layers/meta-networking/recipes-*/*/*.bbappend \ " + +addpylib ${LAYERDIR}/lib oeqa diff --git a/meta-security-compliance/conf/layer.conf b/meta-security-compliance/conf/layer.conf index 82409a6..cb33c2c 100644 --- a/meta-security-compliance/conf/layer.conf +++ b/meta-security-compliance/conf/layer.conf @@ -13,3 +13,5 @@ LAYERSERIES_COMPAT_scanners-layer = "mickledore" LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" BBLAYERS_LAYERINDEX_NAME_scanners-layer = "meta-security-compliance" + +addpylib ${LAYERDIR}/lib oeqa diff --git a/meta-security-isafw/conf/layer.conf b/meta-security-isafw/conf/layer.conf index 550cced..fca5868 100644 --- a/meta-security-isafw/conf/layer.conf +++ b/meta-security-isafw/conf/layer.conf @@ -15,3 +15,5 @@ LAYERVERSION_security-isafw = "1" LAYERDEPENDS_security-isafw = "core" LAYERSERIES_COMPAT_security-isafw = "mickledore" + +addpylib ${LAYERDIR}/lib oeqa diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf index 12bd6b7..3b199f7 100644 --- a/meta-tpm/conf/layer.conf +++ b/meta-tpm/conf/layer.conf @@ -24,3 +24,5 @@ INHERIT += "sanity-meta-tpm" BBFILES_DYNAMIC += " \ networking-layer:${LAYERDIR}/dynamic-layers/meta-networking/recipes-*/*/*.bbappend \ " + +addpylib ${LAYERDIR}/lib oeqa -- cgit v1.2.3-54-g00ecf