diff options
author | Pedro Baptista <pedro.miguel.baptista@gmail.com> | 2023-02-15 22:51:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-17 18:02:04 +0000 |
commit | 5630cb5ccd4d16c192e5c40fd2972e275ce04cfe (patch) | |
tree | 0d470450eed20a8a8b731fb527f193e3561fefe6 /bitbake | |
parent | 77f91746dc86656dd960d910698c51a0559d1837 (diff) | |
download | poky-5630cb5ccd4d16c192e5c40fd2972e275ce04cfe.tar.gz |
bitbake: action.py: add topdir in bblayers_conf path for add-layer
By including the full path to bblayers.conf the add-layer
command can be executed from any location, not only from the
build directory.
(Bitbake rev: 77aa230bf2a053fc0941723a6abbc798ebe53a19)
Signed-off-by: Pedro Baptista <pedro.miguel.baptista@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bblayers/action.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bblayers/action.py b/bitbake/lib/bblayers/action.py index 454c251410..d1ba101de2 100644 --- a/bitbake/lib/bblayers/action.py +++ b/bitbake/lib/bblayers/action.py | |||
@@ -11,6 +11,7 @@ import shutil | |||
11 | import sys | 11 | import sys |
12 | import tempfile | 12 | import tempfile |
13 | 13 | ||
14 | from bb.cookerdata import findTopdir | ||
14 | import bb.utils | 15 | import bb.utils |
15 | 16 | ||
16 | from bblayers.common import LayerPlugin | 17 | from bblayers.common import LayerPlugin |
@@ -37,7 +38,7 @@ class ActionPlugin(LayerPlugin): | |||
37 | sys.stderr.write("Specified layer directory %s doesn't contain a conf/layer.conf file\n" % layerdir) | 38 | sys.stderr.write("Specified layer directory %s doesn't contain a conf/layer.conf file\n" % layerdir) |
38 | return 1 | 39 | return 1 |
39 | 40 | ||
40 | bblayers_conf = os.path.join('conf', 'bblayers.conf') | 41 | bblayers_conf = os.path.join(findTopdir(),'conf', 'bblayers.conf') |
41 | if not os.path.exists(bblayers_conf): | 42 | if not os.path.exists(bblayers_conf): |
42 | sys.stderr.write("Unable to find bblayers.conf\n") | 43 | sys.stderr.write("Unable to find bblayers.conf\n") |
43 | return 1 | 44 | return 1 |