[PATCH v2 3/3] multiarch: Replace divertion of deploy task for "all" packages

["'Andreas Naumann' via isar-users" <isar-users@googlegroups.com>]

Diverting the do_deploy_deb function of the base package to the native variant
had the sideeffect that the dependencies of the native variant were added to
the dependency chain even if the package was originally depended on in its non-
native form.

Fix this by not manipulating the dependencies at all, but just build the base
package for the host architecture. That way sub-dependencies are preserved for
all uses cases.

Fixes:  5a7c2f7004 ("handle DPKG_ARCH=all case for transitive deps")
Signed-off-by: Andreas Naumann <anaumann@emlix.com>
---
 meta/classes/multiarch.bbclass | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass
index 74b8f5b8..851d1aa1 100644
--- a/meta/classes/multiarch.bbclass
+++ b/meta/classes/multiarch.bbclass
@@ -31,8 +31,6 @@ python() {
     # build native separately only when it differs from the target variant
     # 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:
@@ -103,17 +101,8 @@ python multiarch_virtclass_handler() {
         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 empty the non-native
-        # do_deploy_dep task and clear the internal dependency chain, but keep
-        # other attached variables like RDEPENDS to preserve the dependency chain.
-        e.data.setVar('do_deploy_deb', '')
-        # clear internal dependencies (e.g. to do_dpkg_build)
-        e.data.setVarFlag('do_deploy_deb', 'deps', [])
-        # dispatch to native variant
-        e.data.setVarFlag('do_deploy_deb', 'depends', f'{pn}-native:do_deploy_deb')
+        # Speed up Arch=all package build
+        e.data.setVar('PACKAGE_ARCH', d.getVar('HOST_ARCH'))
 }
 addhandler multiarch_virtclass_handler
 multiarch_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
-- 
2.43.0

-- 
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/20251118143523.2326879-4-anaumann%40emlix.com.