diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc index c8ae38b599..f7316251a7 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc @@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-09-30 07:24:11.683650+00:00 for version 6.1.52 +# Generated at 2023-09-30 07:25:44.111735+00:00 for version 6.1.53 python check_kernel_cve_status_version() { - this_version = "6.1.52" + this_version = "6.1.53" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) @@ -4796,7 +4796,7 @@ CVE_STATUS[CVE-2023-25012] = "cpe-stable-backport: Backported in 6.1.16" CVE_STATUS[CVE-2023-2513] = "fixed-version: Fixed from version 6.0rc1" -# CVE-2023-25775 needs backporting (fixed from 6.1.53) +CVE_STATUS[CVE-2023-25775] = "cpe-stable-backport: Backported in 6.1.53" CVE_STATUS[CVE-2023-2598] = "fixed-version: only affects 6.3rc1 onwards" @@ -5036,9 +5036,9 @@ CVE_STATUS[CVE-2023-4208] = "cpe-stable-backport: Backported in 6.1.45" CVE_STATUS[CVE-2023-4273] = "cpe-stable-backport: Backported in 6.1.45" -# CVE-2023-42752 needs backporting (fixed from 6.1.53) +CVE_STATUS[CVE-2023-42752] = "cpe-stable-backport: Backported in 6.1.53" -# CVE-2023-42753 needs backporting (fixed from 6.1.53) +CVE_STATUS[CVE-2023-42753] = "cpe-stable-backport: Backported in 6.1.53" # CVE-2023-42755 needs backporting (fixed from 6.1.55) @@ -5060,7 +5060,7 @@ CVE_STATUS[CVE-2023-4611] = "fixed-version: only affects 6.4rc1 onwards" # CVE-2023-4622 needs backporting (fixed from 6.5rc1) -# CVE-2023-4623 needs backporting (fixed from 6.1.53) +CVE_STATUS[CVE-2023-4623] = "cpe-stable-backport: Backported in 6.1.53" # CVE-2023-4881 needs backporting (fixed from 6.1.54) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 05e0b69331..4168a936bb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "7327e7ab3b5508182380405a51f2657f5bf669b4" -SRCREV_meta ?= "9e389e7f44a22bc637328f15e106f6d60631780e" +SRCREV_machine ?= "af2faa46d440ee11170ba8233eec0f818988f256" +SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" 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.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.52" +LINUX_VERSION ?= "6.1.53" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 942aa48c02..80a3f06eee 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.52" +LINUX_VERSION ?= "6.1.53" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_meta ?= "9e389e7f44a22bc637328f15e106f6d60631780e" +SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 000317379f..61f3e532fb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "3028542fe5ece9dd32c8e3b9b14b2c9f4c9cafac" -SRCREV_machine:qemuarm64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_machine:qemuloongarch64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_machine:qemumips ?= "33c0b5a0c1af6abb4dee11ffa5ece66ffd01d3c8" -SRCREV_machine:qemuppc ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_machine:qemuriscv64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_machine:qemuriscv32 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_machine:qemux86 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_machine:qemux86-64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_machine:qemumips64 ?= "ee418f38dbc9794b7976ad11fd74f5a3490c7c5e" -SRCREV_machine ?= "b3879adf00e338e66e92431a434fa2549ac88b83" -SRCREV_meta ?= "9e389e7f44a22bc637328f15e106f6d60631780e" +SRCREV_machine:qemuarm ?= "b11af7d1c8b4337347747977173c878e7672eb15" +SRCREV_machine:qemuarm64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_machine:qemuloongarch64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_machine:qemumips ?= "81af09853cc4318fad59e780c830c9cc8ccdc898" +SRCREV_machine:qemuppc ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_machine:qemuriscv64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_machine:qemuriscv32 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_machine:qemux86 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_machine:qemux86-64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_machine:qemumips64 ?= "6ec5ef2f6fa90a5823e131805845738453bc553a" +SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" +SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "59b13c2b647e464dd85622c89d7f16c15d681e96" +SRCREV_machine:class-devupstream ?= "09045dae0d902f9f78901a26c7ff1714976a38f9" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.52" +LINUX_VERSION ?= "6.1.53" PV = "${LINUX_VERSION}+git"