summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-02-05 12:05:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 18:00:20 +0000
commit19e06e6584ab2aa31709bcf8fe7b566cafd297e7 (patch)
tree34f434c275cc2df3717f31882ea3196c1a7e5a79
parent1bb00223844bfabe1f6d75c8179d4cbbd4fb5466 (diff)
downloadpoky-19e06e6584ab2aa31709bcf8fe7b566cafd297e7.tar.gz
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>
-rw-r--r--meta-yocto/classes/poky-sanity.bbclass8
-rw-r--r--meta-yocto/conf/distro/poky.conf1
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 @@
1# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades
2
1python poky_update_bblayersconf() { 3python poky_update_bblayersconf() {
2 current_version = int(d.getVar('LCONF_VERSION', True) or -1) 4 current_version = int(d.getVar('LCONF_VERSION', True) or -1)
3 latest_version = int(d.getVar('LAYER_CONF_VERSION', True) or -1) 5 latest_version = int(d.getVar('LAYER_CONF_VERSION', True) or -1)
@@ -5,7 +7,8 @@ python poky_update_bblayersconf() {
5 bblayers_fn = bblayers_conf_file(d) 7 bblayers_fn = bblayers_conf_file(d)
6 lines = sanity_conf_read(bblayers_fn) 8 lines = sanity_conf_read(bblayers_fn)
7 9
8 if current_version == 5 and latest_version == 6: 10 if current_version == 5 and latest_version > 5:
11 # Handle split out of meta-yocto-bsp from meta-yocto
9 if '/meta-yocto-bsp' not in d.getVar('BBLAYERS', True): 12 if '/meta-yocto-bsp' not in d.getVar('BBLAYERS', True):
10 index, meta_yocto_line = sanity_conf_find_line('meta-yocto\s*\\\\\\n', lines) 13 index, meta_yocto_line = sanity_conf_find_line('meta-yocto\s*\\\\\\n', lines)
11 if meta_yocto_line: 14 if meta_yocto_line:
@@ -21,4 +24,5 @@ python poky_update_bblayersconf() {
21 sys.exit() 24 sys.exit()
22} 25}
23 26
24BBLAYERS_CONF_UPDATE_FUNCS += "poky_update_bblayersconf" 27# Prepend to ensure our function runs before the OE-Core one
28BBLAYERS_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>"
10TARGET_VENDOR = "-poky" 10TARGET_VENDOR = "-poky"
11 11
12LOCALCONF_VERSION = "1" 12LOCALCONF_VERSION = "1"
13LAYER_CONF_VERSION ?= "6"
14 13
15# Override these in poky based distros 14# Override these in poky based distros
16POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland" 15POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland"