From b0004095767a39dd614335ab58c28332ff7b2254 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 10 Oct 2025 09:29:33 +0200 Subject: [PATCH] selftest/bblayers: fix up compatibility with integrated poky and separate layer checkouts Specifically: - when using integrated poky, autobuilder clones it into 'build', rather than 'poky' - do not use a catch-all default to tweak the commit id openembedded-core, rather make it specific to that repository. (From OE-Core rev: 9a77dea19b0a9b07a21648e6f231d936d7387846) Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/bblayers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/bblayers.py b/meta/lib/oeqa/selftest/cases/bblayers.py index 8026e7ed4a..982287c9a5 100644 --- a/meta/lib/oeqa/selftest/cases/bblayers.py +++ b/meta/lib/oeqa/selftest/cases/bblayers.py @@ -157,11 +157,11 @@ class BitbakeLayers(OESelftestTestCase): with open(jsonfile) as f: data = json.load(f) for s in data['sources']: - if s == 'poky': + if s == 'poky' or s == 'build': data['sources'][s]['git-remote']['rev'] = '5200799866b92259e855051112520006e1aaaac0' elif s == 'meta-yocto': data['sources'][s]['git-remote']['rev'] = '913bd8ba4dd1d5d2a38261bde985b64a36e36281' - else: + elif s == 'openembedded-core': data['sources'][s]['git-remote']['rev'] = '744a2277844ec9a384a9ca7dae2a634d5a0d3590' with open(jsonfile, 'w') as f: json.dump(data, f)