From 6ea6facd662fd7127c1cd8479eb67cf0ba71476c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 14 Apr 2012 18:31:24 +0100 Subject: 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 --- meta/classes/update-alternatives.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/classes') 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) -- cgit v1.2.3-54-g00ecf