diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-08 14:27:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-10 21:18:21 +0000 |
commit | d299ec06db4ca8085ce5e1a2af3b5337b728d003 (patch) | |
tree | 942da2cb83fe016ae00f9c683833d3cbee5739cc | |
parent | 25fd2bf815fe92b1e45165bd5e8fb4372f6bd0d1 (diff) | |
download | poky-d299ec06db4ca8085ce5e1a2af3b5337b728d003.tar.gz |
dummy-sdk-package.inc: do multilib expanesion for RREPLACES as well
Otherwise, multilib packages such as lib64-perl aren't properly replaced:
Error:
Problem: package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts with lib64-perl provided by lib64-perl-5.30.1-r0.x86_64
- package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts with lib64-perl-module-strict provided by lib64-perl-5.30.1-r0.x86_64
- package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts with lib64-perl-module-warnings provided by lib64-perl-5.30.1-r0.x86_64
- package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts with lib64-perl-module-vars provided by lib64-perl-5.30.1-r0.x86_64
(From OE-Core rev: 1f807b2c51df8a7e66d7aad6e531afef42942e6e)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/meta/dummy-sdk-package.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc index 61afab1d76..bedde2965c 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc | |||
@@ -19,12 +19,13 @@ PR[vardeps] += "DUMMYPROVIDES" | |||
19 | PR[vardeps] += "DUMMYPROVIDES_PACKAGES" | 19 | PR[vardeps] += "DUMMYPROVIDES_PACKAGES" |
20 | 20 | ||
21 | DUMMYPROVIDES_PACKAGES ??= "" | 21 | DUMMYPROVIDES_PACKAGES ??= "" |
22 | DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" | 22 | DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" |
23 | DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" | ||
23 | 24 | ||
24 | python populate_packages_prepend() { | 25 | python populate_packages_prepend() { |
25 | p = d.getVar("PN") | 26 | p = d.getVar("PN") |
26 | d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") | 27 | d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") |
27 | d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") | 28 | d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") |
28 | d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES}") | 29 | d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") |
29 | } | 30 | } |
30 | 31 | ||