Re: [PATCH 2/2] handle DPKG_ARCH=all case for transitive deps

["'MOESSBAUER, Felix' via isar-users" <isar-users@googlegroups.com>]

On Wed, 2025-08-20 at 14:41 +0200, Felix Moessbauer wrote:
> Arch=all packages might build depend on other arch=all packages, hence we
> need to correctly model the dependency chain. Otherwise the transitive
> dependencies are built for the distro arch instead of the native arch.
> 
> We implement this by dispatching the non-native variant of DPKG_ARCH=all
> packages to the -native variant by adding a dependency. We further
> replace the non-native do_deploy_dep task with a noop to preserve the
> dependency chain.

This patch unfortunately creates some downstream fallout, but a simple
revert is also not the solution.

The patch solves the issue where a DPKG_ARCH=all package depends on
other DPKG_ARCH=all packages, however it does break the case where a
DPKG_ARCH=all package depends on DPKG_ARCH=any packages.

A workaround is to use DPKG_ARCH="any" for the main package, but a
proper solution is needed. 

I need to think about a proper solution, but likely that will be by
explicitly modeling dependencies to -all packages by annotating them
with -all (instead of -native).

Best regards,
Felix

> 
> Co-developed-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/classes/multiarch.bbclass | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass
> index babdfbd4..c2bba21f 100644
> --- a/meta/classes/multiarch.bbclass
> +++ b/meta/classes/multiarch.bbclass
> @@ -29,7 +29,11 @@ python() {
>              d.appendVar('BBCLASSEXTEND', ' compat')
>  
>      # build native separately only when it differs from the target variant
> -    if not archIsAll and archDiffers:
> +    # We must not short-circuit for DPKG_ARCH=all packages, as they might
> +    # have transitive dependencies which need to be built for -native.
> +    # This special handling for DPKG_ARCH=all packages is left to the
> +    # multiarch_virtclass_handler
> +    if archDiffers:
>          d.appendVar('BBCLASSEXTEND', ' native')
>      else:
>          extend_provides(pn, 'native', d)
> @@ -86,6 +90,8 @@ python multiarch_virtclass_handler() {
>              d.setVar(var, ' '.join(multiarch_var))
>  
>      pn = e.data.getVar('PN')
> +    archDiffers = d.getVar('HOST_ARCH') != d.getVar('DISTRO_ARCH')
> +    archIsAll = d.getVar('DPKG_ARCH') == 'all'
>      if pn.endswith('-compat'):
>          e.data.setVar('BPN', pn[:-len('-compat')])
>          e.data.appendVar('OVERRIDES', ':class-compat')
> @@ -96,6 +102,16 @@ python multiarch_virtclass_handler() {
>          e.data.appendVar('OVERRIDES', ':class-native')
>          fixup_pn_in_vars(e.data)
>          fixup_depends('-native', e.data)
> +    elif archIsAll and archDiffers:
> +        # Arch=all packages might build depend on other arch=all packages,
> +        # hence we need to correctly model the dependency chain.
> +        # We implement this by dispatching the non-native variant to the -native
> +        # variant by adding a dependency. We further replace the non-native
> +        # do_deploy_dep task with a noop to preserve the dependency chain.
> +        e.data.setVar('do_deploy_deb', '')
> +        bb.build.deltask('deploy_deb', e.data)
> +        bb.build.addtask('deploy_deb', 'do_build', '', e.data)
> +        e.data.setVarFlag('do_deploy_deb', 'depends', f'{pn}-native:do_deploy_deb')
>  }
>  addhandler multiarch_virtclass_handler
>  multiarch_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
> -- 
> 2.50.1

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/f401397eb2ed67464ce2ce01a1ac0ac6c353b200.camel%40siemens.com.