[PATCH 0/3] OE-Core changes to support bitbake-layers layerindex-fetch

[PATCH 0/3] OE-Core changes to support bitbake-layers layerindex-fetch

[Paul Eggleton]

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(-)

-- 
1.9.3

[PATCH 1/3] bitbake.conf: Add two variables for layer index

[Paul Eggleton]

From: Chong Lu <Chong.Lu@windriver.com>

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]

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/conf/bitbake.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b5b54b7..10ee42a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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.
 ##################################################################
 
-- 
1.9.3

[PATCH 2/3] layer.conf: set a variable to map to the OE Layer Index name

[Paul Eggleton]

Add 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]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/conf/layer.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 4fd3a16..e5e1f06 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -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}/../")}'
 
-- 
1.9.3

[PATCH 3/3] lib/oeqa/selftest/bblayers: use dashed subcommands

[Paul Eggleton]

bitbake-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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/lib/oeqa/selftest/bblayers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py
index 1ead8e8..449c17e 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -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)
-- 
1.9.3