poky.conf: resolve mismatch between poky bblayers version and OE-Core

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

(From meta-yocto rev: 3e4404c73602e8cb9efca0f6f2ec788ff68046eb)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 6 insertions, 3 deletions

diff --git a/meta-yocto/classes/poky-sanity.bbclass b/meta-yocto/classes/poky-sanity.bbclass
index fff08b3a8a..77c266e946 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 d5bdbac6cd..459192886e 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"