summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2020-08-27 15:58:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-10 18:07:40 (GMT)
commit43bd93ff8b1b4abd79aa1cfa78dd6733c14e5f34 (patch)
treea560db009d0a4d8b93b9c4b9f071256ed7d7bb5d /meta/classes
parent35cc7fef84b986c1893c80c75dc057e002a2357f (diff)
downloadpoky-43bd93ff8b1b4abd79aa1cfa78dd6733c14e5f34.tar.gz
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. (From OE-Core rev: be88ca5c4bd0dd98d172a53727c7104d46349fdd) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 6a5395dec34192db233bfb2a060e5ccc99708f03) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 2d96e64..23ff477 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1544,7 +1544,7 @@ fi
1544 # Symlinks needed for rprovides lookup 1544 # Symlinks needed for rprovides lookup
1545 rprov = d.getVar('RPROVIDES_%s' % pkg) or d.getVar('RPROVIDES') 1545 rprov = d.getVar('RPROVIDES_%s' % pkg) or d.getVar('RPROVIDES')
1546 if rprov: 1546 if rprov:
1547 for p in rprov.strip().split(): 1547 for p in bb.utils.explode_deps(rprov):
1548 subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg) 1548 subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg)
1549 bb.utils.mkdirhier(os.path.dirname(subdata_sym)) 1549 bb.utils.mkdirhier(os.path.dirname(subdata_sym))
1550 oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True) 1550 oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True)