diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2012-09-27 15:44:11 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 16:48:33 +0100 |
commit | cbddb898c2dc6fe78780dfc337f9d3aad9205bc7 (patch) | |
tree | 08e91c92a6541b927d01577230fe60cedd61db76 | |
parent | 7c2b1d5366b021d921a4ecf1ee3a67fc833af3a3 (diff) | |
download | ast2050-yocto-poky-cbddb898c2dc6fe78780dfc337f9d3aad9205bc7.zip ast2050-yocto-poky-cbddb898c2dc6fe78780dfc337f9d3aad9205bc7.tar.gz |
poky-sanity.bbclass: bblayers.conf should be updated automatically
- 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>
-rw-r--r-- | meta-yocto/classes/poky-sanity.bbclass | 16 | ||||
-rw-r--r-- | meta-yocto/conf/distro/poky.conf | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/meta-yocto/classes/poky-sanity.bbclass b/meta-yocto/classes/poky-sanity.bbclass new file mode 100644 index 0000000..1c7514f --- /dev/null +++ b/meta-yocto/classes/poky-sanity.bbclass @@ -0,0 +1,16 @@ +python check_bblayers_conf_append() { + if current_lconf != lconf_version: + if current_lconf == 5: + index, meta_yocto_line = find_line('meta-yocto\s*\\\\\\n', lines) + if meta_yocto_line: + lines.insert(index + 1, meta_yocto_line.replace('meta-yocto', + 'meta-yocto-bsp')) + else: + sys.exit() + + index, line = find_line('LCONF_VERSION', lines) + current_lconf += 1 + lines[index] = 'LCONF_VERSION = "%d"\n' % current_lconf + with open(bblayers_fn, "w") as f: + f.write(''.join(lines)) +} diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index f7b9e99..8489e56 100644 --- a/meta-yocto/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf @@ -98,6 +98,9 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # OELAYOUT_ABI = "8" +# add poky sanity bbclass +INHERIT += "poky-sanity" + #WARN_QA = "unsafe-references-in-binaries unsafe-references-in-scripts" WARN_QA = "" ERROR_QA = "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms useless-rpaths rpaths staticdev ldflags" |