CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ostree: fix some invalid condition checking

Browse Source 
- 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@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ming Liu 2019-11-07 23:27:16 +01:00 committed by Khem Raj
parent d8ab89a24b
commit 412a93a1c1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-oe/recipes-extended/ostree/ostree_2019.5.bb
View File

@ -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.')