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>
This commit is contained in:
Richard Purdie
2012-04-14 18:31:24 +01:00
parent dc2192cabc
commit 6ea6facd66

View File

@@ -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)