mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

ostree: Fix DISTRO_FEATURES with ptest but w/o xattr

Browse Source 
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@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alex Kiernan
2019-12-02 19:33:39 +00:00
committed by Khem Raj
parent d93da893d2
commit f6df0263f7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+2 -2
View File
@@ -182,8 +182,8 @@ SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"
python __anonymous() { python __anonymous() {
if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d): if bb.utils.contains('PTEST_ENABLED', '1', 'True', '', d):
if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d): if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', '', d):
raise bb.parse.SkipRecipe('ptest requires meta-python to be present.') raise bb.parse.SkipRecipe('ptest requires meta-python to be present.')
elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d): elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d):
raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.') raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.')