diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 18:31:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 22:54:50 +0100 |
commit | 6ea6facd662fd7127c1cd8479eb67cf0ba71476c (patch) | |
tree | feaf64d6ba237ca3f70d34496421330a5ef2faad | |
parent | dc2192cabc007241dd805503a1015529b5e33c07 (diff) | |
download | ast2050-yocto-poky-6ea6facd662fd7127c1cd8479eb67cf0ba71476c.zip ast2050-yocto-poky-6ea6facd662fd7127c1cd8479eb67cf0ba71476c.tar.gz |
update-alternatives: Fix for compatibility with multilib recipes
The PN == BPN test was designed to exclude native/nativesdk but also unfortunately
excludes multilib unintentionally. This change fixes this and allows multilib images
with alternatives to funciton correctly.
[YOCTO #2214]
(From OE-Core rev: 2878d19c4e19d76cb8be15825c40ff03f25f35f5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/update-alternatives.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index ae58344..7b0518d 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -69,15 +69,16 @@ done } update_alternatives_batch_doinstall() { -if [ "${PN}" = "${BPN}" ] ; then for link in ${ALTERNATIVE_LINKS} do mv ${D}${link} ${D}${link}.${PN} done -fi } def update_alternatives_after_parse(d): + if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d): + return + if d.getVar('ALTERNATIVE_LINKS') != None: doinstall = d.getVar('do_install', 0) doinstall += d.getVar('update_alternatives_batch_doinstall', 0) |