OE-Core changes to support bitbake-layers layerindex-fetch
cover OE-Core changes to support bitbake-layers layerindex-fetch
Some changes to support a bitbake patchset to allow fetching layers from the OE layer index from the command line - we need some pieces in OE-Core to avoid hardcoded knowledge of OE creeping in (+ one fix for some deprecated syntax).
The following changes since commit 530565c6cb77319f4cc49edeea6fec6be997415d:
glibc: Update to glibc 2.21 release tag (2015-02-19 17:04:19 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/bblayers-layerindex-oecore
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/bblayers-layerindex-oecore
Chong Lu (1):
bitbake.conf: Add two variables for layer index
Paul Eggleton (2):
layer.conf: set a variable to map to the OE Layer Index name lib/oeqa/selftest/bblayers: use dashed subcommands
meta/conf/bitbake.conf | 6 ++++++ meta/conf/layer.conf | 2 ++ meta/lib/oeqa/selftest/bblayers.py | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/3 bitbake.conf: Add two variables for layer index
From: Chong Lu <[email protected]>
Add BBLAYERS_LAYERINDEX_URL variable that bitbake-layers can use to find layer index. Add BBLAYERS_FETCH_DIR variable that bitbake-layers can use to specify fetch directory.
[YOCTO #5348]
--- meta/conf/bitbake.conf | 6 ++++++ 1 file changed, 6 insertions(+)
meta/conf/bitbake.conf +6 -0
@@ -551,6 +551,12 @@ SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" BUILD_OPTIMIZATION = "-O2 -pipe" ################################################################## +# Settings used by bitbake-layers. +################################################################## +BBLAYERS_LAYERINDEX_URL ??= "http://layers.openembedded.org/layerindex/" +BBLAYERS_FETCH_DIR ??= "${COREBASE}" + +################################################################## # Download locations and utilities. ##################################################################
Signature · 1 line
1.9.3
PATCH 2/3 layer.conf: set a variable to map to the OE Layer Index name
In reply to Paul EggletonAdd a variable that allows us to map the OE-Core layer to the name that represents it in the OpenEmbedded layer index. This will be used by bitbake-layers layerindex-fetch so that it knows that for example OE-Core is already fetched and included in the current configuration.
Note - it won't be required for us to go around and set this for every layer - we can do the matching based on repo and subdirectory, but OE-Core is somewhat special in that it does sometimes appear in different places, for example in poky.
[YOCTO #5348]
--- meta/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+)
meta/conf/layer.conf +2 -0
@@ -11,6 +11,8 @@ BBFILE_PRIORITY_core = "5" # cause compatibility issues with other layers LAYERVERSION_core = "4" +BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" + # Set a variable to get to the top of the metadata location COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
Signature · 1 line
1.9.3
PATCH 3/3 lib/oeqa/selftest/bblayers: use dashed subcommands
In reply to Paul Eggletonbitbake-layers subcommands with underscores are the old syntax; the dashed form has been supported (and displayed in the help text) for quite a while now, and the old syntax is about to be unsupported, so use the dashed form in the tests.
--- meta/lib/oeqa/selftest/bblayers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/lib/oeqa/selftest/bblayers.py +3 -3
@@ -18,17 +18,17 @@ class BitbakeLayers(oeSelfTest): @testcase(83) def test_bitbakelayers_showlayers(self): - result = runCmd('bitbake-layers show_layers') + result = runCmd('bitbake-layers show-layers') self.assertTrue('meta-selftest' in result.output) @testcase(93) def test_bitbakelayers_showappends(self): - result = runCmd('bitbake-layers show_appends') + result = runCmd('bitbake-layers show-appends') self.assertTrue('xcursor-transparent-theme_0.1.1.bbappend' in result.output, msg='xcursor-transparent-theme_0.1.1.bbappend file was not recognised') @testcase(90) def test_bitbakelayers_showoverlayed(self): - result = runCmd('bitbake-layers show_overlayed') + result = runCmd('bitbake-layers show-overlayed') self.assertTrue('aspell' in result.output, msg='xcursor-transparent-theme_0.1.1.bbappend file was not recognised') @testcase(95)
Signature · 1 line
1.9.3