Patchwork [5/6] psplash: Fix multilib build

login
register
mail settings
Submitter Richard Purdie
Date April 18, 2013, 2:33 p.m.
Message ID <1366295611-4646-5-git-send-email-richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/48505/
State Accepted
Commit 412378b0b8fba06d3930c3f64df576885d8d5b07
Headers show

Comments

Richard Purdie - April 18, 2013, 2:33 p.m.
The update-alternatives for multilibs are broken and nothing provides psplash in a
multilib build. This fixes the multilib code.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/psplash/psplash_git.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 2d0cae3..bbeaa0b 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -56,8 +56,8 @@  python __anonymous() {
         ep = '%s%s' % (mlprefix, p)
         epsplash = '%s%s' % (mlprefix, 'psplash')
         d.setVar("FILES_%s" % ep, "${bindir}/%s" % p)
-        d.setVar("ALTERNATIVE_%s" % ep, epsplash)
-        d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, epsplash, '${bindir}/%s' % p)
+        d.setVar("ALTERNATIVE_%s" % ep, 'psplash')
+        d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % p)
         d.appendVar("RDEPENDS_%s" % ep, " %s" % pn)
         if p == "psplash-default":
             d.appendVar("RRECOMMENDS_%s" % pn, " %s" % ep)