]> code.ossystems Code Review - openembedded-core.git/commit
multilib_script: fix packages split
authorKai Kang <kai.kang@windriver.com>
Mon, 26 Nov 2018 03:14:54 +0000 (22:14 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 27 Nov 2018 22:11:22 +0000 (22:11 +0000)
commit841bcbe429dcab54de3b89a927394750f9ccae60
treebb1156ecaf763812fb4582e84c2a87297b861690
parentd31ff84a5f4723700ed48fd14ace81d3c707065e
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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/multilib_script.bbclass