diff mbox series

[yocto-autobuilder2] steps: Handle wrynose mixin special case in non-wrynose builds

Message ID 20260909161536.718818-1-richard.purdie@linuxfoundation.org
State New
Headers show
Series [yocto-autobuilder2] steps: Handle wrynose mixin special case in non-wrynose builds | expand

Commit Message

Richard Purdie Sept. 9, 2026, 4:15 p.m. UTC 
We don't want the wrynose mixin for qcom leaking into our other
builds. This workaround is horrible but the least worst solution I
could find.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 steps/writebbsetupjson.py | 4 ++++
 steps/writelayerinfo.py   | 3 +++
 2 files changed, 7 insertions(+)
diff mbox series

Patch

diff --git a/steps/writebbsetupjson.py b/steps/writebbsetupjson.py
index e1f14634..68a8b2db 100644
--- a/steps/writebbsetupjson.py
+++ b/steps/writebbsetupjson.py
@@ -39,6 +39,10 @@  class WriteBBSetupJson(steps.StringDownload):
             branch = self.getProperty("branch_{}".format(repo))
             revision = self.getProperty("commit_{}".format(repo))
 
+            # Skip mixin-wrynose-linux-firmware for non wrynose builds
+            if "wrynose" in repo and "wrynose" not in branch:
+                continue
+
             if revision and revision != "HEAD":
                 rev = revision
             else:
diff --git a/steps/writelayerinfo.py b/steps/writelayerinfo.py
index 741888b1..cdfd0657 100644
--- a/steps/writelayerinfo.py
+++ b/steps/writelayerinfo.py
@@ -29,6 +29,9 @@  class WriteLayerInfo(steps.StringDownload):
             location = self.getProperty("location_{}".format(repo))
             if location:
                 repodict["location"] = location
+            # Skip mixin-wrynose-linux-firmware for non wrynose builds
+            if "wrynose" in repo and "wrynose" not in repodict["branch"]:
+                continue
             layerinfo[repo] = repodict
 
         return json.dumps(layerinfo, sort_keys=True, indent=4,