diff mbox series

[yocto-autobuilder-helper] config.json/scripts: account for 'layers' -> 'sources' rename in bitbake-setup

Message ID 20251107080114.402494-1-alex.kanavin@gmail.com
State New
Headers show
Series [yocto-autobuilder-helper] config.json/scripts: account for 'layers' -> 'sources' rename in bitbake-setup | expand

Commit Message

Alexander Kanavin Nov. 7, 2025, 8:01 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

I hope nothing falls out; I carefully grepped for all occurences of
'layers' in the tree, and corrected all spots where that was a path
component.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 config.json                     | 40 ++++++++++++++++-----------------
 scripts/build-perf-test-wrapper |  2 +-
 scripts/getproperties.py        |  8 +++----
 scripts/run-config              |  2 +-
 scripts/run-patchtest-selftest  |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)
diff mbox series

Patch

diff --git a/config.json b/config.json
index f65563b..d9f14e0 100644
--- a/config.json
+++ b/config.json
@@ -89,7 +89,7 @@ 
             "step1" : {
                 "shortname" : "Machine oe-selftest",
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1 oe-selftest ${HELPERSTMACHTARGS} -j 15"],
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"]
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"]
             }
         },
         "altcfg-qemu" : {
@@ -225,7 +225,7 @@ 
                     "RPM_GPG_SIGN_CHUNK = '1'"
                 ],
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1 oe-selftest -a --skip-tests distrodata.Distrodata.test_checkpkg -T yocto-mirrors -T machine -T toolchain-user -T toolchain-system -j 15"],
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"]
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"]
             }
         },
         "buildperf" : {
@@ -262,7 +262,7 @@ 
             "step2" : {
                 "shortname" : "OE Selftest",
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail/ DISPLAY=:1 oe-selftest -a --skip-tests distrodata.Distrodata.test_checkpkg reproducible -T yocto-mirrors -T machine -T toolchain-user -T toolchain-system -j 15"],
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"]
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"]
             },
             "step3" : {
                 "shortname" : "Python Linter Report",
@@ -282,7 +282,7 @@ 
             "step1" : {
                 "shortname" : "Reproducible Selftest",
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail/ DISPLAY=:1 oe-selftest -r reproducible"],
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"]
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"]
 
             }
         },
@@ -291,7 +291,7 @@ 
             "SDKMACHINE" : "x86_64",
             "NEEDREPOS" : ["bitbake", "meta-openembedded"],
             "ADDLAYER" : [
-                "${BUILDDIR}/../layers/openembedded-core/meta-selftest"
+                "${BUILDDIR}/../sources/openembedded-core/meta-selftest"
             ],
             "extravars" : [
                 "EXCLUDE_FROM_WORLD:layer-core = '1'",
@@ -467,7 +467,7 @@ 
             "step1" : {
                 "shortname" : "Sources pre-fetching",
                 "BBTARGETS" : "universe -c fetch -k",
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"],
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"],
                 "extravars" : [
                     "SOURCE_MIRROR_FETCH = '1'"
                 ]
@@ -483,7 +483,7 @@ 
             "step1" : {
                 "shortname" : "Source Mirror Selftest",
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1 oe-selftest -a -t yocto-mirrors -j 15"],
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"]
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"]
             }
         }
 
@@ -563,7 +563,7 @@ 
             "step1" : {
                 "shortname" : "Sources pre-fetching (arm specific)",
                 "BBTARGETS" : "universe -c fetch -k",
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"],
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"],
                 "extravars" : [
                     "SOURCE_MIRROR_FETCH = '1'"
                 ]
@@ -1197,10 +1197,10 @@ 
             "NEEDREPOS" : ["bitbake", "meta-mingw"],
             "DISTRO" : "nodistro",
             "step1" : {
-                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-poky"]
+                "EXTRACMDS" : ["yocto-check-layer ../sources/meta-yocto/meta-poky"]
             },
             "step2" : {
-                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-yocto-bsp"]
+                "EXTRACMDS" : ["yocto-check-layer ../sources/meta-yocto/meta-yocto-bsp"]
             },
             "step3" : {
                 "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-mingw"]
@@ -1273,7 +1273,7 @@ 
             },
             "step2" : {
                 "shortname" : "Patch metrics for meta",
-                "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --oecore ../layers/openembedded-core/ --metrics ./yocto-metrics --repo ../layers/openembedded-core/ --layer ../layers/openembedded-core/meta --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics --push"]
+                "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --oecore ../sources/openembedded-core/ --metrics ./yocto-metrics --repo ../sources/openembedded-core/ --layer ../sources/openembedded-core/meta --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics --push"]
             },
             "step3" : {
                 "shortname" : "CVE checks for meta",
@@ -1281,7 +1281,7 @@ 
             },
             "step4" : {
                 "shortname" : "Patch metrics for meta-oe",
-                "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --oecore ../layers/openembedded-core/ --metrics ./yocto-metrics-meta-oe --repo ../meta-openembedded --layer ../meta-openembedded --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics-meta-oe --push"]
+                "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --oecore ../sources/openembedded-core/ --metrics ./yocto-metrics-meta-oe --repo ../meta-openembedded --layer ../meta-openembedded --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics-meta-oe --push"]
             },
             "step5" : {
                 "shortname" : "CVE checks for meta-oe",
@@ -1465,7 +1465,7 @@ 
                     "IMAGE_INSTALL:append = ' service hello-mod'",
                     "TEST_SUITES:append = ' skeletoninit'"
                 ],
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-skeleton"]
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-skeleton"]
             },
             "step4" : {
                 "shortname" : "Systemd with sysvinit compat",
@@ -1532,9 +1532,9 @@ 
             "step1" : {
                 "shortname" : "setup AUH",
                 "EXTRAPLAINCMDS" : [
-                    "git -C ../layers/openembedded-core config user.email auh@yoctoproject.org",
-                    "git -C ../layers/openembedded-core config user.name 'Auto Upgrade Helper'",
-                    "git -C ../layers/openembedded-core switch -C tmp-auh-upgrades HEAD",
+                    "git -C ../sources/openembedded-core config user.email auh@yoctoproject.org",
+                    "git -C ../sources/openembedded-core config user.name 'Auto Upgrade Helper'",
+                    "git -C ../sources/openembedded-core switch -C tmp-auh-upgrades HEAD",
                     "install -D ${SCRIPTSDIR}/auh-config/upgrade-helper.conf ./upgrade-helper/upgrade-helper.conf"
                 ]
             },
@@ -1679,7 +1679,7 @@ 
             "step1" : {
                 "shortname" : "Yocto Mirror Selftest",
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1 oe-selftest -r buildoptions.SourceMirroring.test_yocto_source_mirror"],
-                "ADDLAYER" : ["${BUILDDIR}/../layers/openembedded-core/meta-selftest"]
+                "ADDLAYER" : ["${BUILDDIR}/../sources/openembedded-core/meta-selftest"]
             }
         },
         "meta-oe-mirror" : {
@@ -1687,7 +1687,7 @@ 
             "MACHINE" : "qemux86-64",
             "NEEDREPOS" : ["bitbake", "meta-openembedded"],
             "ADDLAYER" : [
-                "${BUILDDIR}/../layers/openembedded-core/meta-selftest",
+                "${BUILDDIR}/../sources/openembedded-core/meta-selftest",
 
                 "${BUILDDIR}/../meta-openembedded/meta-oe",
                 "${BUILDDIR}/../meta-openembedded/meta-python",
@@ -1772,11 +1772,11 @@ 
 	    "NEEDREPOS" : ["bitbake"],
 	    "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchtest-selftest ${HELPERBUILDDIR}/.."],
 	    "ADDLAYER" : [
-	        "${BUILDDIR}/../layers/openembedded-core/meta-selftest"
+	        "${BUILDDIR}/../sources/openembedded-core/meta-selftest"
 	    ]
 	},
         "toaster" : {
-            "EXTRACMDS" : ["${SCRIPTSDIR}/run-toaster-tests ${HELPERBUILDDIR} ${HELPERBUILDDIR}/../layers/bitbake"]
+            "EXTRACMDS" : ["${SCRIPTSDIR}/run-toaster-tests ${HELPERBUILDDIR} ${HELPERBUILDDIR}/../sources/bitbake"]
         }
     },
     "repo-defaults" : {
diff --git a/scripts/build-perf-test-wrapper b/scripts/build-perf-test-wrapper
index 989e898..66c4ab9 100755
--- a/scripts/build-perf-test-wrapper
+++ b/scripts/build-perf-test-wrapper
@@ -78,7 +78,7 @@  hostname = os.uname()[1]
 
 print("Running on " + hostname)
 
-gitdir = args.build_dir + "/../layers/openembedded-core"
+gitdir = args.build_dir + "/../sources/openembedded-core"
 
 os.chdir(gitdir)
 
diff --git a/scripts/getproperties.py b/scripts/getproperties.py
index 5c342c7..2af176e 100755
--- a/scripts/getproperties.py
+++ b/scripts/getproperties.py
@@ -27,8 +27,8 @@  jsonprops = {}
 jsonprops['commit_yocto-autobuilder-helper'] = get_revision(builddir + "/../yocto-autobuilder-helper/")
 jsonprops['branch_yocto-autobuilder-helper'] = get_branch(builddir + "/../yocto-autobuilder-helper/")
 #set below to a combined hash
-#jsonprops['yp_build_revision'] = get_revision(builddir + "/layers/openembedded-core/")
-jsonprops['yp_build_branch'] = get_branch(builddir + "/layers/openembedded-core/")
+#jsonprops['yp_build_revision'] = get_revision(builddir + "/sources/openembedded-core/")
+jsonprops['yp_build_branch'] = get_branch(builddir + "/sources/openembedded-core/")
 
 done = []
 
@@ -36,8 +36,8 @@  def getrevs(jsonprops, layerpath, layername):
     jsonprops['commit_' + layername] = get_revision(layerpath)
     jsonprops['branch_' + layername ] = get_branch(layerpath)
 
-for layer in os.listdir(builddir + "/layers"):
-    layerpath = builddir + "/layers/" + layer
+for layer in os.listdir(builddir + "/sources"):
+    layerpath = builddir + "/sources/" + layer
     if layer == "logs" or os.path.islink(layerpath):
         continue
     if not os.path.isdir(layerpath):
diff --git a/scripts/run-config b/scripts/run-config
index 17610ea..8731000 100755
--- a/scripts/run-config
+++ b/scripts/run-config
@@ -157,7 +157,7 @@  elif extratools:
     if args.phase == "init" and args.stepname == "extratools":
         sys.exit(0)
 
-logconfig = args.builddir + "/../layers/bitbake/contrib/autobuilderlog.json"
+logconfig = args.builddir + "/../sources/bitbake/contrib/autobuilderlog.json"
 print("Using BB_LOGCONFIG=%s" % logconfig)
 os.environ["BB_LOGCONFIG"] = logconfig
 
diff --git a/scripts/run-patchtest-selftest b/scripts/run-patchtest-selftest
index 197edf7..5157bb0 100755
--- a/scripts/run-patchtest-selftest
+++ b/scripts/run-patchtest-selftest
@@ -9,7 +9,7 @@  set -u
 set -o pipefail
 set -x
 
-oecoredir=$(realpath "$1")/layers/openembedded-core/
+oecoredir=$(realpath "$1")/sources/openembedded-core/
 
 python3 -m venv venv --without-pip --system-site-packages
 source venv/bin/activate