[oe-commits] [bitbake] branch master updated: cooker: list all nonexistent bblayer directories

git at git.openembedded.org git at git.openembedded.org
Tue Jun 18 10:24:45 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository bitbake.

The following commit(s) were added to refs/heads/master by this push:
     new 19291f7  cooker: list all nonexistent bblayer directories
19291f7 is described below

commit 19291f7c4d17086ebb6a7b80c3cb06333d7fd55b
Author: Oleksandr Kravchuk <open.source at oleksandr-kravchuk.com>
AuthorDate: Fri Jun 14 02:09:25 2019 +0200

    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 <open.source at oleksandr-kravchuk.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 f8ae410..842275d 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list