diff mbox series

[yocto-autobuilder-helper] scripts/setup-config: Remove all fragments before setting new ones

Message ID 20251127230259.892390-1-richard.purdie@linuxfoundation.org
State New
Headers show
Series [yocto-autobuilder-helper] scripts/setup-config: Remove all fragments before setting new ones | expand

Commit Message

Richard Purdie Nov. 27, 2025, 11:02 p.m. UTC 
We can't unset individual fragments so we need to disable all before
setting the ones we want.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 scripts/setup-config | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/scripts/setup-config b/scripts/setup-config
index c06dabf..06bd595 100755
--- a/scripts/setup-config
+++ b/scripts/setup-config
@@ -64,17 +64,22 @@  for v in ["SDKMACHINE", "PACKAGE_CLASSES"]:
 machine = utils.getconfigvar("MACHINE", ourconfig, args.target, stepnum) 
 distro = utils.getconfigvar("DISTRO", ourconfig, args.target, stepnum)
 
-def enable_fragment(fragment):
-    if fragment.endswith("/unset"):
-        return
-
-    cmd = ". ./init-build-env; bitbake-config-build enable-fragment %s" % fragment
+def runcmd(cmd):
     cmdpath = args.builddir
-
     print("Running '%s' in %s\n" % (cmd, cmdpath))
     utils.flush()
     subprocess.check_call(["/bin/bash", "-c", cmd], cwd=cmdpath)
 
+def disable_all_fragments():
+    cmd = ". ./init-build-env; bitbake-config-build disable-all-fragments"
+    runcmd(cmd)
+
+def enable_fragment(fragment):
+    if fragment.endswith("/unset"):
+        return
+
+    cmd = ". ./init-build-env; bitbake-config-build enable-fragment %s" % fragment
+    runcmd(cmd)
 
 for v in ["DLDIR", "PRSERV"]:
     value = utils.getconfigvar(v, ourconfig, args.target, stepnum)
@@ -143,6 +148,7 @@  with open(sdkextraconf, "w") as f:
         print("  " + v)
         f.write(v + "\n")
 
+disable_all_fragments()
 if machine:
     enable_fragment("machine/" + machine)
 if distro: