]> 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, 8 Jan 2019 20:12:03 +0000 (20:12 +0000)
commitde222b08fbcc46f60da811a5542d20a9346c32df
tree75418e787538591e260729b66479161637de4557
parent44f552c93f7053794289c0bc8cf1defadb8a6a06
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>
meta/classes/multilib_script.bbclass