[oe] [meta-oe][PATCH 1/5] ostree: Fix DISTRO_FEATURES with ptest but w/o xattr

Alex Kiernan alex.kiernan at gmail.com
Mon Dec 2 19:33:39 UTC 2019


Fix the test for PTEST_ENABLED so it only fires when it's actually enabled, as
opposed to everytime. This allows the tautological test for native to be
removed as PTEST_ENABLED isn't set there.

Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
---

 meta-oe/recipes-extended/ostree/ostree_2019.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
index b3b34a15e694..b2bfaaf0514b 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
@@ -182,8 +182,8 @@ SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service"
 BBCLASSEXTEND = "native"
 
 python __anonymous() {
-    if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d):
-        if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d):
+    if bb.utils.contains('PTEST_ENABLED', '1', 'True', '', d):
+        if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', '', d):
             raise bb.parse.SkipRecipe('ptest requires meta-python to be present.')
         elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d):
             raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.')
-- 
2.17.1



More information about the Openembedded-devel mailing list