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:51:55 +0100 |
| commit | 2878d19c4e19d76cb8be15825c40ff03f25f35f5 (patch) | |
| tree | 4e1670fcc9cef49c5dd354720e9f718ec4860f55 /meta/classes/update-alternatives.bbclass | |
| parent | 823a2f96df84547216a26697838977a162f838c5 (diff) | |
| download | openembedded-core-2878d19c4e19d76cb8be15825c40ff03f25f35f5.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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/update-alternatives.bbclass')
| -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 ae58344d3d..7b0518d848 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) |