From 19291f7c4d17086ebb6a7b80c3cb06333d7fd55b Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Fri, 14 Jun 2019 02:09:25 +0200 Subject: cooker: list all nonexistent bblayer directories Check existence of all the bblayer direcotories at once and print them all, so if there are multiple nonexistent directories, user does not have to correct bblayers.conf and restart bitbake multiple times. [YOCTO #11647] Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- lib/bb/cookerdata.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py index f8ae41093..842275d53 100644 --- a/lib/bb/cookerdata.py +++ b/lib/bb/cookerdata.py @@ -342,14 +342,24 @@ class CookerDataBuilder(object): data = parse_config_file(layerconf, data) layers = (data.getVar('BBLAYERS') or "").split() + broken_layers = [] data = bb.data.createCopy(data) approved = bb.utils.approved_variables() + + # Check whether present layer directories exist for layer in layers: if not os.path.isdir(layer): - parselog.critical("Layer directory '%s' does not exist! " - "Please check BBLAYERS in %s" % (layer, layerconf)) - sys.exit(1) + broken_layers.append(layer) + + if broken_layers: + parselog.critical("The following layer directories do not exist:") + for layer in broken_layers: + parselog.critical(" %s", layer) + parselog.critical("Please check BBLAYERS in %s" % (layerconf)) + sys.exit(1) + + for layer in layers: parselog.debug(2, "Adding layer %s", layer) if 'HOME' in approved and '~' in layer: layer = os.path.expanduser(layer) -- cgit 1.2.3-korg