diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-10-10 09:29:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-10-13 18:01:03 +0100 |
| commit | b0004095767a39dd614335ab58c28332ff7b2254 (patch) | |
| tree | cf2168483da66d0dc7b0d314423d67c4fca136ce /meta/lib | |
| parent | a2b8dde6f21c2ef2d7e8dd9e630b46bbb1573249 (diff) | |
| download | poky-b0004095767a39dd614335ab58c28332ff7b2254.tar.gz | |
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 <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/bblayers.py | 4 |
1 files 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): | |||
| 157 | with open(jsonfile) as f: | 157 | with open(jsonfile) as f: |
| 158 | data = json.load(f) | 158 | data = json.load(f) |
| 159 | for s in data['sources']: | 159 | for s in data['sources']: |
| 160 | if s == 'poky': | 160 | if s == 'poky' or s == 'build': |
| 161 | data['sources'][s]['git-remote']['rev'] = '5200799866b92259e855051112520006e1aaaac0' | 161 | data['sources'][s]['git-remote']['rev'] = '5200799866b92259e855051112520006e1aaaac0' |
| 162 | elif s == 'meta-yocto': | 162 | elif s == 'meta-yocto': |
| 163 | data['sources'][s]['git-remote']['rev'] = '913bd8ba4dd1d5d2a38261bde985b64a36e36281' | 163 | data['sources'][s]['git-remote']['rev'] = '913bd8ba4dd1d5d2a38261bde985b64a36e36281' |
| 164 | else: | 164 | elif s == 'openembedded-core': |
| 165 | data['sources'][s]['git-remote']['rev'] = '744a2277844ec9a384a9ca7dae2a634d5a0d3590' | 165 | data['sources'][s]['git-remote']['rev'] = '744a2277844ec9a384a9ca7dae2a634d5a0d3590' |
| 166 | with open(jsonfile, 'w') as f: | 166 | with open(jsonfile, 'w') as f: |
| 167 | json.dump(data, f) | 167 | json.dump(data, f) |
