aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2020-08-27 16:58:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-28 07:06:44 +0100
commit6a5395dec34192db233bfb2a060e5ccc99708f03 (patch)
tree9490eea68e2c4b067df4e20bcf1e75d4f3e22c6d
parent5dc237aa6aa8d86433ff7885b88efd8a7b79aa74 (diff)
downloadopenembedded-core-contrib-6a5395dec34192db233bfb2a060e5ccc99708f03.tar.gz
openembedded-core-contrib-6a5395dec34192db233bfb2a060e5ccc99708f03.tar.bz2
openembedded-core-contrib-6a5395dec34192db233bfb2a060e5ccc99708f03.zip
package.bbclass: explode the RPROVIDES so we don't think the versions are provides
emit_pkgdata() creates symlinks for each of the RPROVIDES in pkgdata/MACHINE/runtime-rprovides. However this string can contain versions which results in directories called (=2.32), so pass the RPROVIDES string through bb.utils.explode_deps() to strip the versions out. Helps mitigate - but not solve - #13999. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 7a36262eb6..464ba8dc6f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1638,7 +1638,7 @@ fi
# Symlinks needed for rprovides lookup
rprov = d.getVar('RPROVIDES_%s' % pkg) or d.getVar('RPROVIDES')
if rprov:
- for p in rprov.strip().split():
+ for p in bb.utils.explode_deps(rprov):
subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg)
bb.utils.mkdirhier(os.path.dirname(subdata_sym))
oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True)