From 6a5395dec34192db233bfb2a060e5ccc99708f03 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 27 Aug 2020 16:58:04 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit 1.2.3-korg