mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
431767f069
multilib_script.bbclass was unable to work correctly in the case where
e.g. a PACKAGECONFIG removed the script that it was intended to rename
(as an example, the "trace" PACKAGECONFIG in cairo). The way to fix this
would be to do something like:
MULTILIB_SCRIPTS = "${@bb.utils.contains('PACKAGECONFIG', 'trace', '${PN}-perf-utils:${bindir}/cairo-trace', '', d)}"
but this is not possible because the variable is not expanded before
being split.
To fix this, change the class to expand the variable before splitting.
There are two cases to be considered that could possibly break:
1) If the RHS of the ":" contains a ":", which is accounted for by
limiting the splitting to 1 split, which will leave the ":" in the
RHS in tact. Of note, this works because ":" isn't valid in a
package name
2) If the RHS of the ":" contained whitespace, however this would have
broken the mv command written to multilibscript_rename(), so this
isn't occurring in practice.
(From OE-Core rev: b9c992e69f3f44051610386ce4f743e224750694)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.3 KiB
Plaintext
40 lines
1.3 KiB
Plaintext
#
|
|
# Copyright OpenEmbedded Contributors
|
|
#
|
|
# SPDX-License-Identifier: MIT
|
|
#
|
|
|
|
#
|
|
# Recipe needs to set MULTILIB_SCRIPTS in the form <pkgname>:<scriptname>, e.g.
|
|
# MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/file1 ${PN}:${base_bindir}/file2"
|
|
# to indicate which script files to process from which packages.
|
|
#
|
|
|
|
inherit update-alternatives
|
|
|
|
MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
|
|
|
|
PACKAGE_PREPROCESS_FUNCS += "multilibscript_rename"
|
|
|
|
multilibscript_rename() {
|
|
:
|
|
}
|
|
|
|
python () {
|
|
# Do nothing if multilib isn't being used
|
|
if not d.getVar("MULTILIB_VARIANTS"):
|
|
return
|
|
# Do nothing for native/cross
|
|
if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d):
|
|
return
|
|
|
|
for entry in (d.getVar("MULTILIB_SCRIPTS") or "").split():
|
|
pkg, script = entry.split(":", 1)
|
|
scriptname = os.path.basename(script)
|
|
d.appendVar("ALTERNATIVE:" + pkg, " " + 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:" + pkg, " " + script + "-${MULTILIB_SUFFIX}")
|
|
}
|