diff mbox series

cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS

Message ID 20230524105631.517832-1-Martin.Jansa@gmail.com
State New
Headers show
Series cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS | expand

Commit Message

Martin Jansa May 24, 2023, 10:56 a.m. UTC
* 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)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/cpio/cpio_2.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Purdie May 24, 2023, 2:55 p.m. UTC | #1
On Wed, 2023-05-24 at 12:56 +0200, Martin Jansa wrote:
> * 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)
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-extended/cpio/cpio_2.14.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/cpio/cpio_2.14.bb b/meta/recipes-extended/cpio/cpio_2.14.bb
> index e55fb70cb1..d6473dc08d 100644
> --- a/meta/recipes-extended/cpio/cpio_2.14.bb
> +++ b/meta/recipes-extended/cpio/cpio_2.14.bb
> @@ -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
Ross Burton May 24, 2023, 3:38 p.m. UTC | #2
On 24 May 2023, at 11:56, Martin Jansa via lists.openembedded.org <Martin.Jansa=gmail.com@lists.openembedded.org> wrote:
> 
> * 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
Richard Purdie May 24, 2023, 3:53 p.m. UTC | #3
On Wed, 2023-05-24 at 15:38 +0000, Ross Burton wrote:
> On 24 May 2023, at 11:56, Martin Jansa via lists.openembedded.org <Martin.Jansa=gmail.com@lists.openembedded.org> wrote:
> > 
> > * 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
diff mbox series

Patch

diff --git a/meta/recipes-extended/cpio/cpio_2.14.bb b/meta/recipes-extended/cpio/cpio_2.14.bb
index e55fb70cb1..d6473dc08d 100644
--- a/meta/recipes-extended/cpio/cpio_2.14.bb
+++ b/meta/recipes-extended/cpio/cpio_2.14.bb
@@ -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"