diff options
| -rw-r--r-- | meta-yocto/classes/poky-sanity.bbclass | 8 | ||||
| -rw-r--r-- | 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 d5bdbac..4591928 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" |
