[PATCH 0/1] bblayers.conf version mismatch fix (poky part)

[PATCH 0/1] bblayers.conf version mismatch fix (poky part)

[Paul Eggleton]

NOTE: there is a corresponding patch for OE-Core that should be applied
at the same time as this patch.


The following change since commit d8f0011c23a6b8441323974acc70b08c81cfefbd:

  opkg-keyrings: New recipe (2015-02-03 14:53:56 +0000)

is available in the git repository at:

  git://git.yoctoproject.org/poky-contrib paule/bblayers-ver-poky
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/bblayers-ver-poky

Paul Eggleton (1):
  poky.conf: resolve mismatch between poky bblayers version and OE-Core

 meta-yocto/classes/poky-sanity.bbclass | 8 ++++++--
 meta-yocto/conf/distro/poky.conf       | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
1.9.3

[PATCH 1/1] poky.conf: resolve mismatch between poky bblayers version and OE-Core

[Paul Eggleton]

Drop our custom LAYER_CONF_VERSION (since the OE-Core version is now the
same) and ensure that poky-sanity's update function runs first so that
anyone still using version 5 with poky gets the meta-yocto /
meta-yocto-bsp split handled instead of OE-Core's no-op upgrade. Also
fix the version check so that the poky 5->6 upgrade is still performed
if the latest version is greater than 6.

NOTE: this of course relies on the corresponding version bump patch in
OE-Core.

Fixes [YOCTO #6139].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-yocto/classes/poky-sanity.bbclass | 8 ++++++--
 meta-yocto/conf/distro/poky.conf       | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-yocto/classes/poky-sanity.bbclass b/meta-yocto/classes/poky-sanity.bbclass
index fff08b3..77c266e 100644
--- a/meta-yocto/classes/poky-sanity.bbclass
+++ b/meta-yocto/classes/poky-sanity.bbclass
@@ -1,3 +1,5 @@
+# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades
+
 python poky_update_bblayersconf() {
     current_version = int(d.getVar('LCONF_VERSION', True) or -1)
     latest_version = int(d.getVar('LAYER_CONF_VERSION', True) or -1)
@@ -5,7 +7,8 @@ python poky_update_bblayersconf() {
     bblayers_fn = bblayers_conf_file(d)
     lines = sanity_conf_read(bblayers_fn)
 
-    if current_version == 5 and latest_version == 6:
+    if current_version == 5 and latest_version > 5:
+        # Handle split out of meta-yocto-bsp from meta-yocto
         if '/meta-yocto-bsp' not in d.getVar('BBLAYERS', True):
             index, meta_yocto_line = sanity_conf_find_line('meta-yocto\s*\\\\\\n', lines)
             if meta_yocto_line:
@@ -21,4 +24,5 @@ python poky_update_bblayersconf() {
     sys.exit()
 }
 
-BBLAYERS_CONF_UPDATE_FUNCS += "poky_update_bblayersconf"
+# Prepend to ensure our function runs before the OE-Core one
+BBLAYERS_CONF_UPDATE_FUNCS =+ "poky_update_bblayersconf"
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 479182f..1e00598 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -10,7 +10,6 @@ MAINTAINER = "Poky <poky@yoctoproject.org>"
 TARGET_VENDOR = "-poky"
 
 LOCALCONF_VERSION = "1"
-LAYER_CONF_VERSION ?= "6"
 
 # Override these in poky based distros
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland"
-- 
1.9.3