yocto.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
From: Armin Kuster <akuster808@gmail.com>
To: yocto@lists.yoctoproject.org
Subject: [meta-security][PATCH 2/2] layer.conf: Insert addpylib declaration
Date: Wed, 17 May 2023 13:26:30 -0400	[thread overview]
Message-ID: <20230517172630.3538600-2-akuster808@gmail.com> (raw)
In-Reply-To: <20230517172630.3538600-1-akuster808@gmail.com>

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 <akuster808@gmail.com>
---
 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
-- 
2.25.1



      reply	other threads:[~2023-05-17 17:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-17 17:26 [meta-security][PATCH 1/2] samhain: Update to 4.4.10 Armin Kuster
2023-05-17 17:26 ` Armin Kuster [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230517172630.3538600-2-akuster808@gmail.com \
    --to=akuster808@gmail.com \
    --cc=yocto@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).