diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-16 16:42:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:31:17 +0000 |
commit | 9d5483c37523ff3d334c98cafb848282b54962cd (patch) | |
tree | adb5f8967d92046bbd77d702caf33aeb63d5cccf /meta-yocto/classes | |
parent | ab3a71833c7f446aeed7e2aebbd3e20d484c71ff (diff) | |
download | poky-9d5483c37523ff3d334c98cafb848282b54962cd.tar.gz |
meta-yocto: Rename to meta-poky to better match its purpose
"poky" is the reference distribution for the Yocto Project. This renames
the layer within the meta-yocto repository to meta-poky, better matching
what that layer contains.
A layer.conf file is left behind as this is the only way which allows
existing builds to migrate safely to the new name. It will be removed
at some future point.
This change requires the corresponding OE-Core change to handle the
migration and the changes to the infrastructure to support this.
(From meta-yocto rev: d0c88df2e14672fca4ebbde93c5efbcd0e4fa9b6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/classes')
-rw-r--r-- | meta-yocto/classes/poky-sanity.bbclass | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta-yocto/classes/poky-sanity.bbclass b/meta-yocto/classes/poky-sanity.bbclass deleted file mode 100644 index 77c266e946..0000000000 --- a/meta-yocto/classes/poky-sanity.bbclass +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | # Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades | ||
2 | |||
3 | python poky_update_bblayersconf() { | ||
4 | current_version = int(d.getVar('LCONF_VERSION', True) or -1) | ||
5 | latest_version = int(d.getVar('LAYER_CONF_VERSION', True) or -1) | ||
6 | |||
7 | bblayers_fn = bblayers_conf_file(d) | ||
8 | lines = sanity_conf_read(bblayers_fn) | ||
9 | |||
10 | if current_version == 5 and latest_version > 5: | ||
11 | # Handle split out of meta-yocto-bsp from meta-yocto | ||
12 | if '/meta-yocto-bsp' not in d.getVar('BBLAYERS', True): | ||
13 | index, meta_yocto_line = sanity_conf_find_line('meta-yocto\s*\\\\\\n', lines) | ||
14 | if meta_yocto_line: | ||
15 | lines.insert(index + 1, meta_yocto_line.replace('meta-yocto', | ||
16 | 'meta-yocto-bsp')) | ||
17 | else: | ||
18 | sys.exit() | ||
19 | |||
20 | current_version += 1 | ||
21 | sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_version) | ||
22 | return | ||
23 | |||
24 | sys.exit() | ||
25 | } | ||
26 | |||
27 | # Prepend to ensure our function runs before the OE-Core one | ||
28 | BBLAYERS_CONF_UPDATE_FUNCS =+ "poky_update_bblayersconf" | ||