[oe-commits] [openembedded-core] 28/92: multilib_script: fix packages split

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch thud
in repository openembedded-core.

commit de222b08fbcc46f60da811a5542d20a9346c32df
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Sun Nov 25 22:14:54 2018 -0500

    multilib_script: fix packages split
    
    In multilib_script.bbclass it renames script file which listed in
    MULTILIB_SCRIPTS. It may mix up packages split. Take package curl as
    example, ${bindir}/curl-config is packaged to curl-dev originally. But
    it is renamed to curl-config-${MULTILIB_SUFFIX} and packaged to curl
    when multilib is enabled.
    
    And expand 'pkg' to fix QA warning:
    
    | WARNING: Variable key FILES_${PN}-dev (
    | ${bindir}/curl-config-${MULTILIB_SUFFIX}) replaces original key
    | FILES_curl-dev (${includedir} ${FILES_SOLIBSDEV} ... ${bindir}/*-config)
    
    Insert a necessary space to the argument 'value' of d.appendVar() as well.
    
    (From OE-Core rev: 841bcbe429dcab54de3b89a927394750f9ccae60)
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/multilib_script.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/multilib_script.bbclass b/meta/classes/multilib_script.bbclass
index 51c9fcc..dc166d0 100644
--- a/meta/classes/multilib_script.bbclass
+++ b/meta/classes/multilib_script.bbclass
@@ -24,9 +24,11 @@ python () {
 
     for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split():
        pkg, script = entry.split(":")
+       epkg = d.expand(pkg)
        scriptname = os.path.basename(script)
-       d.appendVar("ALTERNATIVE_" + pkg, scriptname + " ")
+       d.appendVar("ALTERNATIVE_" + epkg, " " + scriptname + " ")
        d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script)
        d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}")
        d.appendVar("multilibscript_rename",  "\n	mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}")
+       d.appendVar("FILES_" + epkg, " " + script + "-${MULTILIB_SUFFIX}")
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.