Skip to contentSkip to conversation

cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS

PATCH Superseded Martin Jansa 3 participants 4 messages May 24, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS

* unlike DEPENDS/RDEPENDS the PACKAGE_WRITE_DEPS dependency isn't automatically extended with MLPREFIX, causing lib32-cpio to depend on 64bit ptest-runner (and all its deps)

---
 meta/recipes-extended/cpio/cpio_2.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/cpio/cpio_2.14.bb +1 -1
index e55fb70cb1..d6473dc08d 100644
@@ -66,7 +66,7 @@ do_install_ptest_base:append() {
 
 # The tests need to run as a non-root user, so pull in the ptest user
 DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}"
-PACKAGE_WRITE_DEPS += "ptest-runner"
+PACKAGE_WRITE_DEPS += "${MLPREFIX}ptest-runner"
 
 RDEPENDS:${PN}-ptest += "ptest-runner"
 
Signature · 1 line
2.40.1
#1 lore raw
Quoted 14 lines · Martin Jansa

* unlike DEPENDS/RDEPENDS the PACKAGE_WRITE_DEPS dependency isn't automatically extended with MLPREFIX, causing lib32-cpio to depend on 64bit ptest-runner (and all its deps)

---
 meta/recipes-extended/cpio/cpio_2.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/cpio/cpio_2.14.bb +0 -0
index e55fb70cb1..d6473dc08d 100644

meta/recipes-extended/cpio/cpio_2.14.bb do_install_ptest_base:append() { · line 72

Quoted 8 lines
meta/recipes-extended/cpio/cpio_2.14.bb +1 -1
@@ -66,7 +66,7 @@ do_install_ptest_base:append() {
 
 # The tests need to run as a non-root user, so pull in the ptest user
 DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}"
-PACKAGE_WRITE_DEPS += "ptest-runner"
+PACKAGE_WRITE_DEPS += "${MLPREFIX}ptest-runner"
 
 RDEPENDS:${PN}-ptest += "ptest-runner"
 

This triggers warnings:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5336/steps/13/logs/warnings

although that does raise some questions about what is going on with nativesdk...

Cheers,

Richard

#2 lore raw
In reply to Martin Jansa
Quoted 4 lines · Martin Jansa via lists.openembedded.org

* unlike DEPENDS/RDEPENDS the PACKAGE_WRITE_DEPS dependency isn't automatically extended with MLPREFIX, causing lib32-cpio to depend on 64bit ptest-runner (and all its deps)

Sounds like the fix should be in the ml extension code, not the recipes?

Ross

#3 lore raw
Quoted 7 lines · Ross Burton
Quoted 4 lines · Martin Jansa via lists.openembedded.org

* unlike DEPENDS/RDEPENDS the PACKAGE_WRITE_DEPS dependency isn't automatically extended with MLPREFIX, causing lib32-cpio to depend on 64bit ptest-runner (and all its deps)

Sounds like the fix should be in the ml extension code, not the recipes?

There are limits to how complex we want to make that code so a prefix here probably isn't a bad thing. The nativesdk error is a bit worrying for other reasons though :/

Cheers,

Richard