diff options
| author | Kai Kang <kai.kang@windriver.com> | 2018-11-25 22:14:54 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-08 20:12:03 +0000 |
| commit | de222b08fbcc46f60da811a5542d20a9346c32df (patch) | |
| tree | 75418e787538591e260729b66479161637de4557 | |
| parent | 44f552c93f7053794289c0bc8cf1defadb8a6a06 (diff) | |
| download | openembedded-core-de222b08fbcc46f60da811a5542d20a9346c32df.tar.gz openembedded-core-de222b08fbcc46f60da811a5542d20a9346c32df.tar.bz2 openembedded-core-de222b08fbcc46f60da811a5542d20a9346c32df.zip | |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/classes/multilib_script.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/multilib_script.bbclass b/meta/classes/multilib_script.bbclass index 51c9fcc12c..dc166d06c1 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}") } |