]> code.ossystems Code Review - openembedded-core.git/commitdiff
package.bbclass: explode the RPROVIDES so we don't think the versions are provides
authorRoss Burton <ross.burton@arm.com>
Thu, 27 Aug 2020 15:58:04 +0000 (16:58 +0100)
committerSteve Sakoman <steve@sakoman.com>
Tue, 1 Sep 2020 15:45:54 +0000 (05:45 -1000)
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>
(cherry picked from commit 6a5395dec34192db233bfb2a060e5ccc99708f03)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/package.bbclass

index 2d96e646dad9d8f54c04ec367539a6c9895bbd1b..23ff4772faa72297c7dba7ff347e86408f679034 100644 (file)
@@ -1544,7 +1544,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)