summaryrefslogtreecommitdiffstats
path: root/scripts/yocto-check-layer
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-08 11:54:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-09 13:18:41 +0000
commit7458ad340f6bc05a2e12e85f3a09feef4d1bf4d2 (patch)
treedd8caae49b2cc764b951d656aae6f55c54f2b321 /scripts/yocto-check-layer
parent1aae880d7db39fcaef0ffd875ad26dd5fd19527e (diff)
downloadpoky-7458ad340f6bc05a2e12e85f3a09feef4d1bf4d2.tar.gz
yocto-check-layer: Allow OE-Core to be tested
For unknown reasons we've never seemingly run the check layer script against OE-Core itself. This isn't entirely straightforward as the core layer is a bit of a special case, we can't for example compare signatures against ourselve and we can't remove core from bblayers.conf. Core does have distro, machine and software components too, in the case of distro, our fallback default settings. Whilst the qemu machines could be split into a seperate layer directory, core wouldn't then parse at all standalone due to the lack of any machine so it seems a bit pointless to do that. These changes tweak the script to handle core's special cases, specifically to allow distro and machine directories and to account for the README placed a directory level higher than other layers. (From OE-Core rev: ba312ed228507d05f280aeb96819d671b01400b8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/yocto-check-layer')
-rwxr-xr-xscripts/yocto-check-layer5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer
index 0e5b75b1f7..67cc71950f 100755
--- a/scripts/yocto-check-layer
+++ b/scripts/yocto-check-layer
@@ -168,14 +168,13 @@ def main():
168 168
169 layers_tested = 0 169 layers_tested = 0
170 for layer in layers: 170 for layer in layers:
171 if layer['type'] == LayerType.ERROR_NO_LAYER_CONF or \ 171 if layer['type'] in (LayerType.ERROR_NO_LAYER_CONF, LayerType.ERROR_BSP_DISTRO):
172 layer['type'] == LayerType.ERROR_BSP_DISTRO:
173 continue 172 continue
174 173
175 # Reset to a clean backup copy for each run 174 # Reset to a clean backup copy for each run
176 shutil.copyfile(bblayersconf + '.backup', bblayersconf) 175 shutil.copyfile(bblayersconf + '.backup', bblayersconf)
177 176
178 if check_bblayers(bblayersconf, layer['path'], logger): 177 if layer['type'] not in (LayerType.CORE, ) and check_bblayers(bblayersconf, layer['path'], logger):
179 logger.info("%s already in %s. To capture initial signatures, layer under test should not present " 178 logger.info("%s already in %s. To capture initial signatures, layer under test should not present "
180 "in BBLAYERS. Please remove %s from BBLAYERS." % (layer['name'], bblayersconf, layer['name'])) 179 "in BBLAYERS. Please remove %s from BBLAYERS." % (layer['name'], bblayersconf, layer['name']))
181 results[layer['name']] = None 180 results[layer['name']] = None