Skip to contentSkip to conversation

dummy-sdk-package: append RREPLACES with DUMMYPROVIDES

PATCH In review [email protected] 2 participants 2 messages Dec 27, 2019 – Dec 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dummy-sdk-package: append RREPLACES with DUMMYPROVIDES

From: Kai Kang <[email protected]>

When multilib is enabled and installs lib32-perl to image, such as set

IMAGE_INSTALL_append = " lib32-perl"

it fails to run task populate_sdk of images:

| Problem: package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target
| conflicts with lib32-perl provided by lib32-perl-5.30.1-r0.i586

Append ${DUMMYPROVIDES} rather than ${DUMMYPROVIDES_PACKAGES} to variable RREPLACES that variable DUMMYPROVIDES contains multilib variants of the packages.

---
 meta/recipes-core/meta/dummy-sdk-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/meta/dummy-sdk-package.inc +1 -1
index 61afab1d76..91466a36e9 100644
@@ -25,6 +25,6 @@ python populate_packages_prepend() {
     p = d.getVar("PN")
     d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}")
     d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}")
-    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES}")
+    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES}")
 }
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 28 lines · On Fri, 2019-12-27 at 16:27 +0800, [email protected] wrote:

From: Kai Kang <[email protected]>

When multilib is enabled and installs lib32-perl to image, such as set

IMAGE_INSTALL_append = " lib32-perl"

it fails to run task populate_sdk of images:

Quoted 3 lines

Problem: package target-sdk-provides-dummy-1.0- r0.sdk_provides_dummy_target
conflicts with lib32-perl provided by lib32-perl-5.30.1-r0.i586

Append ${DUMMYPROVIDES} rather than ${DUMMYPROVIDES_PACKAGES} to variable RREPLACES that variable DUMMYPROVIDES contains multilib variants of the packages.

---
 meta/recipes-core/meta/dummy-sdk-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/meta/dummy-sdk-package.inc +0 -0
index 61afab1d76..91466a36e9 100644

meta/recipes-core/meta/dummy-sdk-package.inc python populate_packages_prepend() { · line 29

Quoted 6 lines
meta/recipes-core/meta/dummy-sdk-package.inc +1 -1
@@ -25,6 +25,6 @@ python populate_packages_prepend() {
     p = d.getVar("PN")
     d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}")
     d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}")
-    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES}")
+    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES}")
 }

This reverts
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=63ad134e3d029accf67e1ba8880f59c7704cb505
?

I believe that is needed for the rpm upgrade which is pending.

Cheers,

Richard