Patch review
cover Patch review
Please review this set of changes for whinlatter and have comments back by end of day Sunday, April 19. I plan to do the release build on Monday.
Please note: This will be the last review cycle for whinlatter. If you expect a patch to get merged and it is not in this series ping me as soon as possible.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3670
The following changes since commit 29abc96b6310fef8dd5ff34c22f0ff0d313ebe0a:
config.json: Drop checkvnc usage (2026-03-16 20:28:25 +0000)
are available in the Git repository at:
https://git.yoctoproject.org/yocto-autobuilder-helper contrib/ycongal/whinlatter
https://git.yoctoproject.org/yocto-autobuilder-helper/log/?h=contrib/ycongal/whinlatter
for you to fetch changes up to 93894832c9a4ce0b96d16e503bed99a959f3d232:
scripts/yocto-supported-distros: fix the centos stream regular expression (2026-04-14 10:10:51 +0200)
----------------------------------------------------------------
Antonin Godard (1):
scripts/yocto-supported-distros: fix the centos stream regular
expression
Richard Purdie (3):
config.json: Set SSTATE_DIR unconditionally config.json: Fix bring up after bitbake-setup changes scripts/utils: Milestones are now yocto- prefixed
Yoann Congal (1):
run-config: drop one more checkvnc usage
config.json | 47 ++++++++++++++++++++++----------- scripts/run-config | 2 +- scripts/utils.py | 5 +--- scripts/yocto-supported-distros | 12 ++------- 4 files changed, 35 insertions(+), 31 deletions(-)
PATCH 1/5 run-config: drop one more checkvnc usage
From: Yoann Congal <[email protected]>
Reference was missed during a global removal in commit 29abc96b6310 ("config.json: Drop checkvnc usage").
This should prevent this warning on AB:
Xvnc not running, attempting restart
WARNING: vncserver has been replaced by a systemd unit and is now considered deprecated and removed in upstream. Please read /usr/share/doc/tigervnc/HOWTO.md for more information.
Killing Xvnc process ID 4057
Xvnc process ID 4057 already killed
WARNING: vncserver has been replaced by a systemd unit and is now considered deprecated and removed in upstream. Please read /usr/share/doc/tigervnc/HOWTO.md for more information.
New 'stream9-vk1:1 (pokybuild)' desktop is stream9-vk1:1
Starting applications specified in /srv/pokybuild/.vnc/xstartup Log file is /srv/pokybuild/.vnc/stream9-vk1:1.log
[0]: https://autobuilder.yoctoproject.org/valkyrie/#/builders/68/builds/3580/steps/14/logs/stdio
--- scripts/run-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/run-config +1 -1
@@ -300,7 +300,7 @@ def handle_stepnum(stepnum): addstepentry("test-targets", "QA targets", shortdesc, desc, str(sanitytargets), str(stepnum)) elif args.stepname == "test-targets": hp.printheader("Step %s/%s: Running bitbake %s" % (stepnum, maxsteps, sanitytargets)) - bitbakecmd(args.builddir, "%s/checkvnc; DISPLAY=:1 bitbake %s -k" % (scriptsdir, sanitytargets), report, stepnum, args.stepname) + bitbakecmd(args.builddir, "DISPLAY=:1 bitbake %s -k" % sanitytargets, report, stepnum, args.stepname) # Run any extra commands specified cmds = utils.getconfiglist("EXTRACMDS", ourconfig, args.target, stepnum)
PATCH 2/5 config.json: Set SSTATE_DIR unconditionally
In reply to Yoann CongalFrom: Richard Purdie <[email protected]>
--- config.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
config.json +6 -6
@@ -35,8 +35,8 @@ "SDKMACHINE" : "x86_64", "PACKAGE_CLASSES" : "package_rpm package_deb package_ipk", "DLDIR" : "DL_DIR = '${BASE_SHAREDDIR}/current_sources'", - "SSTATEDIR" : ["SSTATE_DIR ?= '${BASE_SHAREDDIR}/pub/sstate'"], - "SSTATEDIR_RELEASE" : ["SSTATE_DIR ?= '${BASE_SHAREDDIR}/pub/sstate'"], + "SSTATEDIR" : ["SSTATE_DIR = '${BASE_SHAREDDIR}/pub/sstate'"], + "SSTATEDIR_RELEASE" : ["SSTATE_DIR = '${BASE_SHAREDDIR}/pub/sstate'"], "SDKEXTRAS" : ["SSTATE_MIRRORS += '\\", "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH'", "BB_HASHSERVE = 'auto'", "BB_HASHSERVE_UPSTREAM = '${AUTOBUILDER_HASHSERV}'"], "BUILDINFO" : false, "BUILDHISTORY" : false,
@@ -191,7 +191,7 @@ }, "bringup" : { "BUILDINFO" : true, - "SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], + "SSTATEDIR" : ["SSTATE_DIR = '${HELPERBUILDDIR}/sstate'"], "MACHINE" : "qemuarm64", "step1" : { "SDKMACHINE" : "x86_64",
@@ -230,8 +230,8 @@ }, "buildperf" : { "MACHINE" : "qemux86", - "SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], - "SSTATEDIR_RELEASE" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], + "SSTATEDIR" : ["SSTATE_DIR = '${HELPERBUILDDIR}/sstate'"], + "SSTATEDIR_RELEASE" : ["SSTATE_DIR = '${HELPERBUILDDIR}/sstate'"], "PACKAGE_CLASSES" : "package_rpm", "EXTRAPLAINCMDS" : [ "${SCRIPTSDIR}/build-perf-test-wrapper --results-dir ${BUILDPERF_RESULTSDIR} --email-addr [email protected] --download-dir ${BUILDPERF_STATEDIR}/downloads --publish-dir ${HELPERRESULTSDIR}/${HELPERTARGET} --repo ${HELPERREPONAME} --branch ${HELPERBRANCHNAME} --push-remote [email protected]:yocto-buildstats --build-dir ${HELPERBUILDDIR}"
@@ -677,7 +677,7 @@ } }, "bringup" : { - "SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], + "SSTATEDIR" : ["SSTATE_DIR = '${HELPERBUILDDIR}/sstate'"], "TEMPLATE" : "bringup" }, "bringup-fast" : {
PATCH 3/5 config.json: Fix bring up after bitbake-setup changes
In reply to Yoann CongalFrom: Richard Purdie <[email protected]>
We have to leave MACHINE/DISTRO unset via fragments for oe-selftest, tweak the bringup target setup to handle this.
--- config.json | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
config.json +25 -10
@@ -192,36 +192,51 @@ "bringup" : { "BUILDINFO" : true, "SSTATEDIR" : ["SSTATE_DIR = '${HELPERBUILDDIR}/sstate'"], - "MACHINE" : "qemuarm64", - "step1" : { - "SDKMACHINE" : "x86_64", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", - "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" - }, + "MACHINE" : "unset", + "DISTRO" : "unset", + "step1" : { + "SDKMACHINE" : "x86_64", + "extravars" : [ + "MACHINE = 'qemuarm64'", + "DISTRO = 'poky'" + ], + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", + "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" + }, "step2" : { "SDKMACHINE" : "x86_64", - "MACHINE" : "qemux86-64", + "extravars" : [ + "MACHINE = 'qemux86-64'", + "DISTRO = 'poky'" + ], "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-ptest-all core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step3" : { "SDKMACHINE" : "i686", + "extravars" : [ + "MACHINE = 'qemuarm64'", + "DISTRO = 'poky'" + ], "BBTARGETS" : "core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" - }, + }, "step4" : { - "MACHINE" : "qemux86-64", "SDKMACHINE" : "i686", + "extravars" : [ + "MACHINE = 'qemux86-64'", + "DISTRO = 'poky'" + ], "BBTARGETS" : "core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step5" : { "BUILDINFO" : false, - "MACHINE" : "qemux86-64", "SDKMACHINE" : "x86_64", "PACKAGE_CLASSES" : "package_rpm", "extravars" : [ + "MACHINE = 'qemux86-64'", "RPM_GPG_SIGN_CHUNK = '1'" ], "EXTRACMDS" : ["DISPLAY=:1 oe-selftest -a --skip-tests distrodata.Distrodata.test_checkpkg -T yocto-mirrors -T machine -T toolchain-user -T toolchain-system -j 15"],
PATCH 4/5 scripts/utils: Milestones are now yocto- prefixed
In reply to Yoann CongalFrom: Richard Purdie <[email protected]>
--- scripts/utils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
scripts/utils.py +1 -4
@@ -524,10 +524,7 @@ def get_string_from_version(version, milestone=None, rc=None): return result def get_tag_from_version(version, milestone): - if not milestone: - return "yocto-" + get_string_from_version(version, milestone) - return get_string_from_version(version, milestone) - + return "yocto-" + get_string_from_version(version, milestone) def get_version_from_string(raw_version): """ Get version as list of int from raw_version.
PATCH 5/5 scripts/yocto-supported-distros: fix the centos stream regular expression
In reply to Yoann CongalFrom: Antonin Godard <[email protected]>
The poky.conf file was wrongly referring these distros with centosstream-*, but this is now fixed. Change the regular expression for CentOS Stream to match this. Remove the CentOS (no Stream) definition as we do not support it anymore and it conflicts with this one.
--- scripts/yocto-supported-distros | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
scripts/yocto-supported-distros +2 -10
@@ -77,13 +77,9 @@ INPUT_REGEXES = { "ab": re.compile(r"^opensuse(\d{2})(\d{1})"), "lsb": re.compile(r"^opensuse-(\d{2})\.(\d{1})"), }, - "centos": { - "ab": re.compile(r"^centos(\d+)"), - "lsb": re.compile(r"^centos-(\d+)"), - }, "centosstream": { "ab": re.compile(r"^stream(\d+)"), - "lsb": re.compile(r"^stream-(\d+)"), + "lsb": re.compile(r"^centos-(\d+)"), }, "rocky": { "ab": re.compile(r"^rocky(\d+)"),
@@ -112,12 +108,8 @@ OUTPUT_FORMATS = { "lsb": "opensuseleap-{}.{}", "docs": "- OpenSUSE Leap {}.{}", }, - "centos": { - "lsb": "centos-{}", - "docs": "- CentOS {}", - }, "centosstream": { - "lsb": "centosstream-{}", + "lsb": "centos-{}", "docs": "- CentOS Stream {}", }, "rocky": {
Richard Purdie
AppliedQuoted 25 lines · Yoann Congal via lists.yoctoproject.org
The following changes since commit
29abc96b6310fef8dd5ff34c22f0ff0d313ebe0a:config.json: Drop checkvnc usage (2026-03-16 20:28:25 +0000)
are available in the Git repository at:
https://git.yoctoproject.org/yocto-autobuilder-helper contrib/ycongal
/whinlatter
https://git.yoctoproject.org/yocto-autobuilder-helper/log/?h=contrib/ycongal/whinlatterfor you to fetch changes up to
93894832c9a4ce0b96d16e503bed99a959f3d232:
scripts/yocto-supported-distros: fix the centos stream regular expression (2026-04-14 10:10:51 +0200)----------------------------------------------------------------
Antonin Godard (1):
scripts/yocto-supported-distros: fix the centos stream regular expression
Quoted 7 lines
Richard Purdie (3):
config.json: SetSSTATE_DIRunconditionally config.json: Fix bring up after bitbake-setup changesscripts/utils: Milestones are now yocto- prefixedYoann Congal (1):
run-config: drop one more checkvnc usage
I've merged this series as they all look to make sense to me for whinlatter, thanks.
Cheers,
Richard