diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta-poky/classes/poky-sanity.bbclass | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta-poky/classes/poky-sanity.bbclass')
-rw-r--r-- | poky/meta-poky/classes/poky-sanity.bbclass | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/poky/meta-poky/classes/poky-sanity.bbclass b/poky/meta-poky/classes/poky-sanity.bbclass new file mode 100644 index 000000000..81cd2eb6a --- /dev/null +++ b/poky/meta-poky/classes/poky-sanity.bbclass @@ -0,0 +1,46 @@ +# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades + +python poky_update_bblayersconf() { + current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1) + latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1) + if current_version == -1 or latest_version == -1: + # one or the other missing => malformed configuration + raise NotImplementedError("You need to update bblayers.conf manually for this version transition") + + success = True + + # check for out of date templateconf.cfg file + lines = [] + fn = os.path.join(d.getVar('TOPDIR', True), 'conf/templateconf.cfg') + + lines = sanity_conf_read(fn) + index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) + if meta_yocto_line: + lines[index] = meta_yocto_line.replace('meta-yocto', 'meta-poky') + with open(fn, "w") as f: + f.write(''.join(lines)) + bb.note("Your conf/templateconf.cfg file was updated from meta-yocto to meta-poky") + + # add any additional layer checks/changes here + + if success: + current_version = latest_version + bblayers_fn = bblayers_conf_file(d) + lines = sanity_conf_read(bblayers_fn) + # sanity_conf_update() will erroneously find a match when the var name + # is used in a comment, so do our own here. The code below can be + # removed when sanity_conf_update() is fixed in OE-Core. + #sanity_conf_update(bblayers_fn, lines, 'POKY_BBLAYERS_CONF_VERSION', current_version) + index, line = sanity_conf_find_line(r'^POKY_BBLAYERS_CONF_VERSION', lines) + lines[index] = 'POKY_BBLAYERS_CONF_VERSION = "%d"\n' % current_version + with open(bblayers_fn, "w") as f: + f.write(''.join(lines)) + bb.note("Your conf/bblayers.conf has been automatically updated.") + if success: + return + + raise NotImplementedError("You need to update bblayers.conf manually for this version transition") +} + +# ensure our function runs after the OE-Core one +BBLAYERS_CONF_UPDATE_FUNCS += "conf/bblayers.conf:POKY_BBLAYERS_CONF_VERSION:REQUIRED_POKY_BBLAYERS_CONF_VERSION:poky_update_bblayersconf" |