Skip to contentSkip to conversation

multilib: skip cross-canadian recipes when renaming package variables

PATCH New [email protected] 1 participant 1 message Sep 28

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 multilib: skip cross-canadian recipes when renaming package variables

From: "mark.yang" <[email protected]>

Return early from do_rename_package_variables() for cross-canadian recipes, as multilib_virtclass_handler_postkeyexp() does before it calls rename_package_variables().

Commit 432ab37a46 ("multilib: extend variables after packages split") added do_rename_package_variables() without the cross-canadian check. add_suffix() returns package names that contain "-cross-" unchanged, so every renameVar() call gets identical old and new keys.

On qemux86-64 with the multilib-x86-lib32 fragment, binutils-cross-canadian-i686:do_package prints 1258 warnings like:

WARNING: binutils-cross-canadian-i686-2.47-r0 do_package: Calling renameVar with equivalent keys (LICENSE:binutils-cross-canadian-i686) is invalid

renameVar() returns right after the warning, so skipping these calls does not change the packaged output.

---
blacksail has 432ab37a46 as well, and this applies there without changes.

 meta/classes/multilib.bbclass | 3 +++
 1 file changed, 3 insertions(+)
meta/classes/multilib.bbclass +3 -0
index 55b8aee882..0d5f1290fa 100644
@@ -218,6 +218,9 @@ def reset_alternative_priority(d):
 PACKAGESPLITFUNCS:append = " do_rename_package_variables"
 
 python do_rename_package_variables() {
+    if bb.data.inherits_class('cross-canadian', d):
+        return
+
     variant = d.getVar("BBEXTENDVARIANT")
     prefixes = (d.getVar("MULTILIB_VARIANTS") or "").split()
     if variant and prefixes:

base-commit: fb479118c94f5448759a3ce8f1aad89d5aebdf75