summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 17:31:24 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 21:54:50 (GMT)
commit6ea6facd662fd7127c1cd8479eb67cf0ba71476c (patch)
treefeaf64d6ba237ca3f70d34496421330a5ef2faad /meta/classes
parentdc2192cabc007241dd805503a1015529b5e33c07 (diff)
downloadpoky-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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/update-alternatives.bbclass5
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
69} 69}
70 70
71update_alternatives_batch_doinstall() { 71update_alternatives_batch_doinstall() {
72if [ "${PN}" = "${BPN}" ] ; then
73 for link in ${ALTERNATIVE_LINKS} 72 for link in ${ALTERNATIVE_LINKS}
74 do 73 do
75 mv ${D}${link} ${D}${link}.${PN} 74 mv ${D}${link} ${D}${link}.${PN}
76 done 75 done
77fi
78} 76}
79 77
80def update_alternatives_after_parse(d): 78def update_alternatives_after_parse(d):
79 if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d):
80 return
81
81 if d.getVar('ALTERNATIVE_LINKS') != None: 82 if d.getVar('ALTERNATIVE_LINKS') != None:
82 doinstall = d.getVar('do_install', 0) 83 doinstall = d.getVar('do_install', 0)
83 doinstall += d.getVar('update_alternatives_batch_doinstall', 0) 84 doinstall += d.getVar('update_alternatives_batch_doinstall', 0)