Skip to contentSkip to conversation

Some more yocto-check-layer fixes

PATCH New Paul Barker 1 participant 3 messages Mar 28 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover Some more yocto-check-layer fixes

This should be the final set of checklayer fixes for 6.0 M3 :)

---
Paul Barker (2):
checklayer: Really fix regex in get_signatures
meson: Disable exe_wrapper for allarch recipes

 meta/classes-recipe/meson.bbclass  | 1 +
 scripts/lib/checklayer/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

---
base-commit: b50d6debf7baa555fbfb3521c4f952675bba2d37
change-id: 20260328-fix-checklayer-3-281eda60535f

Best regards,

Signature · 1 line
Paul Barker
#1 lore raw

PATCH 1/2 checklayer: Really fix regex in get_signatures

The previous attempt to fix the regex in get_signatures was only a partial success. We should just be comparing unihash values, inclusion of the taskhash value in our comparison adds no benefit. Inclusion of the task hash also results in invalid bitbake-diffsigs commands being recommended if there are conflicting signatures.

Fixes a2f7052cf832 ("checklayer: Fix regex in get_signatures")
---
 scripts/lib/checklayer/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/checklayer/__init__.py +1 -1
index 15459b6e0486..f9ba44d08d88 100644
@@ -324,7 +324,7 @@ def get_signatures(builddir, failsafe=False, machine=None, extravars=None):
         else:
             raise
 
-    sig_regex = re.compile(r"^(?P<task>[^:]*:[^:]*):(?P<hash>.*) .$")
+    sig_regex = re.compile(r"^(?P<task>[^:]*:[^:]*)(:(?P<taskhash>[^:]*))?:(?P<hash>.*) .$")
     tune_regex = re.compile(r"(^|\s)SIGGEN_LOCKEDSIGS_t-(?P<tune>\S*)\s*=\s*")
     current_tune = None
     with open(sigs_file, 'r') as f:
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 meson: Disable exe_wrapper for allarch recipes

In reply to Paul Barker

Arch-independent recipes should not require execution of programs compiled for the target during the build, as there shouldn't be anything compiled for the target.

Removing the dependency on MACHINE_FEATURES for allarch recipes which use meson fixes several signature conflicts reported by yocto-check-layer.

---
 meta/classes-recipe/meson.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes-recipe/meson.bbclass +1 -0
index 2c098771fec2..9bed293603c2 100644
@@ -9,6 +9,7 @@ inherit python3native meson-routines qemu
 DEPENDS:append = " meson-native ninja-native"
 
 EXEWRAPPER_ENABLED:class-native = "False"
+EXEWRAPPER_ENABLED:allarch = "False"
 EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}"
 DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ''}"
 
Signature · 1 line
2.43.0