* [PATCH 0/1] multilib_script: fix packages split
@ 2018-11-26 3:14 kai.kang
2018-11-26 3:14 ` [PATCH 1/1] " kai.kang
0 siblings, 1 reply; 2+ messages in thread
From: kai.kang @ 2018-11-26 3:14 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
The following changes since commit 6bf94ad3b6a3f1202e86b500bfce205d0bda977e:
u-boot: Upgrade 2018.07 -> 2018.11 (2018-11-23 23:35:20 +0000)
are available in the Git repository at:
git://git.pokylinux.org/poky-contrib kangkai/ml_script
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/ml_script
Kai Kang (1):
multilib_script: fix packages split
meta/classes/multilib_script.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
2.19.0.rc2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] multilib_script: fix packages split
2018-11-26 3:14 [PATCH 0/1] multilib_script: fix packages split kai.kang
@ 2018-11-26 3:14 ` kai.kang
0 siblings, 0 replies; 2+ messages in thread
From: kai.kang @ 2018-11-26 3:14 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
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>
---
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 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}")
}
--
2.19.0.rc2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-26 3:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-26 3:14 [PATCH 0/1] multilib_script: fix packages split kai.kang
2018-11-26 3:14 ` [PATCH 1/1] " kai.kang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.