mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Paul Eggleton
2015-02-05 12:05:54 +00:00
committed by Richard Purdie
parent 1bb0022384
commit 19e06e6584
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-yocto/classes/poky-sanity.bbclass
+6 -2
View File
@@ -1,3 +1,5 @@
# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades
python poky_update_bblayersconf() { python poky_update_bblayersconf() {
current_version = int(d.getVar('LCONF_VERSION', True) or -1) current_version = int(d.getVar('LCONF_VERSION', True) or -1)
latest_version = int(d.getVar('LAYER_CONF_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) bblayers_fn = bblayers_conf_file(d)
lines = sanity_conf_read(bblayers_fn) 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): if '/meta-yocto-bsp' not in d.getVar('BBLAYERS', True):
index, meta_yocto_line = sanity_conf_find_line('meta-yocto\s*\\\\\\n', lines) index, meta_yocto_line = sanity_conf_find_line('meta-yocto\s*\\\\\\n', lines)
if meta_yocto_line: if meta_yocto_line:
@@ -21,4 +24,5 @@ python poky_update_bblayersconf() {
sys.exit() 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"
meta-yocto/conf/distro/poky.conf
-1
View File
@@ -10,7 +10,6 @@ MAINTAINER = "Poky <poky@yoctoproject.org>"
TARGET_VENDOR = "-poky" TARGET_VENDOR = "-poky"
LOCALCONF_VERSION = "1" LOCALCONF_VERSION = "1"
LAYER_CONF_VERSION ?= "6"
# Override these in poky based distros # Override these in poky based distros
POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland" POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland"