summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
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-08-28 06:08:37 (GMT)
commitc278eaf0c5bd5a2fb180f9c4916a6b68b5335356 (patch)
treebb952598276dbbc941bfb5a1dbea3d0e35223275 /meta/classes/package.bbclass
parent635f67efaa62fe2109444b34f6ee389ecb88058e (diff)
downloadpoky-c278eaf0c5bd5a2fb180f9c4916a6b68b5335356.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: 6a5395dec34192db233bfb2a060e5ccc99708f03) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-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 7a36262..464ba8d 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1638,7 +1638,7 @@ fi
1638 # Symlinks needed for rprovides lookup 1638 # Symlinks needed for rprovides lookup
1639 rprov = d.getVar('RPROVIDES_%s' % pkg) or d.getVar('RPROVIDES') 1639 rprov = d.getVar('RPROVIDES_%s' % pkg) or d.getVar('RPROVIDES')
1640 if rprov: 1640 if rprov:
1641 for p in rprov.strip().split(): 1641 for p in bb.utils.explode_deps(rprov):
1642 subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg) 1642 subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg)
1643 bb.utils.mkdirhier(os.path.dirname(subdata_sym)) 1643 bb.utils.mkdirhier(os.path.dirname(subdata_sym))
1644 oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True) 1644 oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True)