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>
* Update for new structure in sanity.bbclass - use a separate function
to update bblayers.conf and add it to the list to be executed
* Additionally, don't add meta-yocto-bsp if it's already in BBLAYERS
(this can occur when switching between DISTRO = "" or other distros
which use a LAYER_CONF_VERSION = "5" and DISTRO = "poky" which has
LAYER_CONF_VERSION = "6")
(From meta-yocto rev: 94b98b4868bfa6f9cb7d9a9f1d62c63665214c32)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- we need a bbclass (poky-sanity) so that we can append to the
check_bblayers_conf bitbake function from sanity.bbclass the
bblayers.conf specific merging functionality
- add check_bblayers_conf_append bitbake function which does the
meta-yocto specific updates (the bblayers.conf v5 -> v6 update)
- every layer should make its specific bblayers.conf updates
- we ask the user to re-run bitbake because we can't trigger
reparsing without being invasive
[YOCTO #3082]
(From meta-yocto rev: 636783633ac0cd5bf66f8b9c9b26cb31ad082451)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Paul Eggleton
Constantin Musca