[oe] [meta-oe] [PATCH] ostree: fix some invalid condition checking
liu.ming50 at gmail.com
liu.ming50 at gmail.com
Thu Nov 7 22:27:16 UTC 2019
From: Ming Liu <liu.ming50 at gmail.com>
- PTEST_ENABLED is a target specific variable, avoid to check that for
ostree-native recipe.
- one of soup, curl PACKAGECONFIG would satisfy not running into the
problem https://github.com/ostreedev/ostree/issues/1897, it should
not stick to soup. For instance, the curl is being chosen in
meta-updater rather than soup.
Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
---
meta-oe/recipes-extended/ostree/ostree_2019.5.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
index 035b4bb..b3b34a1 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
@@ -182,10 +182,10 @@ SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service"
BBCLASSEXTEND = "native"
python __anonymous() {
- if bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d):
- if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split():
+ 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):
raise bb.parse.SkipRecipe('ptest requires meta-python to be present.')
- elif 'soup' not in d.getVar('PACKAGECONFIG').split():
+ elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d):
raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.')
elif not oe.utils.any_distro_features(d, "xattr"):
raise bb.parse.SkipRecipe('ptest requires xattr enabled in DISTRO_FEATURES.')
--
2.7.4
More information about the Openembedded-devel
mailing list