build-appliance-image: Update to nanbield head revision

(From OE-Core rev: 4c261f8cbdf0c7196a74daad041d04eb093015f3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2026-01-29 21:08:42 +01:00 · 2023-10-19 23:56:34 +01:00 · 2023-10-19 23:15:04 +01:00 · 2023-10-19 17:01:41 +01:00 · 2023-10-19 17:01:04 +01:00 · 2023-10-19 17:01:04 +01:00
5 changed files with 25 additions and 19 deletions
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -26,8 +26,8 @@ inherit core-image setuptools3 features_check

 REQUIRED_DISTRO_FEATURES += "xattr"

-SRCREV ?= "dc262335f9e002bcfd84a71d41874beebdd84e9a"
-SRC_URI = "git://git.yoctoproject.org/poky;branch=master \
+SRCREV ?= "631f5c6d4ffd7a26eb9911628a0087a5aebfe8d3"
+SRC_URI = "git://git.yoctoproject.org/poky;branch=nanbield \
           file://Yocto_Build_Appliance.vmx \
           file://Yocto_Build_Appliance.vmxf \
           file://README_VirtualBox_Guest_Additions.txt \
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
@@ -14,8 +14,8 @@ python () {
        raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }

-SRCREV_machine ?= "541ff832e9f2a168145f96ff41857a6cf1c74289"
-SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7"
+SRCREV_machine ?= "2aa14dbb8520e59358778a80b32d7ccf6dd6c2ac"
+SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784"

 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
           git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.5;destsuffix=${KMETA};protocol=https"
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"

-SRCREV_machine ?= "8ad515e79001700d5e3d36e6ffe37ebdae2b5cd4"
-SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7"
+SRCREV_machine ?= "dfe7f47645429e162819c3d5690d8f5052f5b5a3"
+SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784"

 PV = "${LINUX_VERSION}+git"

--- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb
@@ -18,18 +18,18 @@ KBRANCH:qemux86-64 ?= "v6.5/standard/base"
 KBRANCH:qemuloongarch64  ?= "v6.5/standard/base"
 KBRANCH:qemumips64 ?= "v6.5/standard/mti-malta64"

-SRCREV_machine:qemuarm ?= "e3bd53c181eb362535991bb0e0c15bf7b8b8e86f"
-SRCREV_machine:qemuarm64 ?= "cd01efb6992e0af5dfef251420291d5984898a9c"
-SRCREV_machine:qemuloongarch64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
-SRCREV_machine:qemumips ?= "76f1c7370493dd6068f6733eb7d6ff9da6e7fae8"
-SRCREV_machine:qemuppc ?= "a3ac3f52f2352476f0fb1b0b4fe7b1c2339f9b18"
-SRCREV_machine:qemuriscv64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
-SRCREV_machine:qemuriscv32 ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
-SRCREV_machine:qemux86 ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
-SRCREV_machine:qemux86-64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
-SRCREV_machine:qemumips64 ?= "59ac3aaf836bd355d0f9f734e7bcca3dde44573a"
-SRCREV_machine ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
-SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7"
+SRCREV_machine:qemuarm ?= "04942abac8568705f1fae34066db171b6e2669bd"
+SRCREV_machine:qemuarm64 ?= "ea4b620f18f882b3d882a53ffa33d8125ab27c83"
+SRCREV_machine:qemuloongarch64 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f"
+SRCREV_machine:qemumips ?= "3348b580e3c47da56ce97a8297a574c2e37bc410"
+SRCREV_machine:qemuppc ?= "2fd47e07960edcd21455548ac6a25b19babe5c10"
+SRCREV_machine:qemuriscv64 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f"
+SRCREV_machine:qemuriscv32 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f"
+SRCREV_machine:qemux86 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f"
+SRCREV_machine:qemux86-64 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f"
+SRCREV_machine:qemumips64 ?= "6706327d870a0f246df8ed20c6a7f51ef46db1d6"
+SRCREV_machine ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f"
+SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784"

 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
--- a/scripts/patchtest
+++ b/scripts/patchtest
@@ -171,8 +171,14 @@ def main():
    log_path = None
    patch_list = None

+    git_status = os.popen("(cd %s && git status)" % PatchTestInput.repodir).read()
+    status_matches = ["Changes not staged for commit", "Changes to be committed"]
+    if any([match in git_status for match in status_matches]):
+        logger.error("patchtest: there are uncommitted changes in the target repo that would be overwritten. Please commit or restore them before running patchtest")
+        return 1
+
    if os.path.isdir(patch_path):
-        patch_list = [os.path.join(patch_path, filename) for filename in os.listdir(patch_path)]
+        patch_list = [os.path.join(patch_path, filename) for filename in sorted(os.listdir(patch_path))]
    else:
        patch_list = [patch_path]
Author	SHA1	Message	Date
Richard Purdie	15b576c410	build-appliance-image: Update to nanbield head revision (From OE-Core rev: 4c261f8cbdf0c7196a74daad041d04eb093015f3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2023-10-19 23:56:34 +01:00
Richard Purdie	631f5c6d4f	build-appliance-image: Update to nanbield head revision (From OE-Core rev: 6ecb3dac0b0033ae92a2727a0ae8803d52edaa64) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2023-10-19 23:15:04 +01:00
Richard Purdie	37e997f797	build-appliance-image: Update to nanbield head revision (From OE-Core rev: 12fa669ea2372e759139430b23edc041e86fb543) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2023-10-19 17:01:41 +01:00
Bruce Ashfield	157e13d4a0	linux-yocto/6.5: serial: core: integrate upstream fixes Integrating the following commit(s) to linux-yocto/6.5: 14f83e409308 serial: core: test for -EINPROGRESS during tx power management validation 1b5b735f311f serial: core: Fix checks for tx runtime PM state dee98a75d75c Revert "serial-core: disable power managment for serial tx" (From OE-Core rev: 4c9a85ed1d69e55963cd77122e5c869b30f3dbe4) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2023-10-19 17:01:04 +01:00
Bruce Ashfield	482c4d0a95	linux-yocto/6.5: config: remove VIDEO_STK1160_COMMON Integrating the following commit(s) to linux-yocto/.: 4531e74daf0 media/media-usb-tv.cfg: remove VIDEO_STK1160_COMMON (From OE-Core rev: 40f2edd66afe5e5af607e110da78eb0a4a0b9cb9) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2023-10-19 17:01:04 +01:00
Ross Burton	53c006ba1a	patchtest: sort when reading patches from a directory When reading patches from a directory it's important to sort the output of os.listdir(), as that returns the files in an effectively random order. We can't test the patches apply if they're applied in the wrong order, and typically patch filenames are prefixed with a counter to ensure the order is correct. (From OE-Core rev: b2bbd5b4071d913ed24a9ffe43d4a97b0db16c6c) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2023-10-19 17:01:04 +01:00
Trevor Gamblin	a98b1229df	patchtest: check for untracked changes [YOCTO #15243] Avoid overwriting local changes when running patchtest by checking for anything unstaged or uncommitted in the target repo, and logging an error if something is found. This will provide the user helpful feedback if (for example) they forgot to commit a change for their patch under test, and will leave the target repository in a reasonable state (rather than a temporary branch created by patchtest). (From OE-Core rev: 2d24ff9568d729b17cfc746d0948e63c78d9f3ae) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2023-10-19 17:01:04 +01:00