diff options
| author |   Ross Burton <ross.burton@arm.com> | 2020-08-27 16:58:04 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-09-01 05:45:54 -1000 |
| commit | be88ca5c4bd0dd98d172a53727c7104d46349fdd (patch) | |
| tree | 9dd657d6ce0d50ef4f2f6445fd1da47441f8008f | |
| parent | 0d4d0df6084cce3c3d9051db88f3199a030d3352 (diff) | |
| download | openembedded-core-contrib-be88ca5c4bd0dd98d172a53727c7104d46349fdd.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.
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>
| -rw-r--r-- | meta/classes/package.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 2d96e646da..23ff4772fa 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -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) |