summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/linux/cve-exclusion_6.1.inc12
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.1.bb28
4 files changed, 26 insertions, 26 deletions
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 @@
1 1
2# Auto-generated CVE metadata, DO NOT EDIT BY HAND. 2# Auto-generated CVE metadata, DO NOT EDIT BY HAND.
3# Generated at 2023-09-30 07:24:11.683650+00:00 for version 6.1.52 3# Generated at 2023-09-30 07:25:44.111735+00:00 for version 6.1.53
4 4
5python check_kernel_cve_status_version() { 5python check_kernel_cve_status_version() {
6 this_version = "6.1.52" 6 this_version = "6.1.53"
7 kernel_version = d.getVar("LINUX_VERSION") 7 kernel_version = d.getVar("LINUX_VERSION")
8 if kernel_version != this_version: 8 if kernel_version != this_version:
9 bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) 9 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"
4796 4796
4797CVE_STATUS[CVE-2023-2513] = "fixed-version: Fixed from version 6.0rc1" 4797CVE_STATUS[CVE-2023-2513] = "fixed-version: Fixed from version 6.0rc1"
4798 4798
4799# CVE-2023-25775 needs backporting (fixed from 6.1.53) 4799CVE_STATUS[CVE-2023-25775] = "cpe-stable-backport: Backported in 6.1.53"
4800 4800
4801CVE_STATUS[CVE-2023-2598] = "fixed-version: only affects 6.3rc1 onwards" 4801CVE_STATUS[CVE-2023-2598] = "fixed-version: only affects 6.3rc1 onwards"
4802 4802
@@ -5036,9 +5036,9 @@ CVE_STATUS[CVE-2023-4208] = "cpe-stable-backport: Backported in 6.1.45"
5036 5036
5037CVE_STATUS[CVE-2023-4273] = "cpe-stable-backport: Backported in 6.1.45" 5037CVE_STATUS[CVE-2023-4273] = "cpe-stable-backport: Backported in 6.1.45"
5038 5038
5039# CVE-2023-42752 needs backporting (fixed from 6.1.53) 5039CVE_STATUS[CVE-2023-42752] = "cpe-stable-backport: Backported in 6.1.53"
5040 5040
5041# CVE-2023-42753 needs backporting (fixed from 6.1.53) 5041CVE_STATUS[CVE-2023-42753] = "cpe-stable-backport: Backported in 6.1.53"
5042 5042
5043# CVE-2023-42755 needs backporting (fixed from 6.1.55) 5043# CVE-2023-42755 needs backporting (fixed from 6.1.55)
5044 5044
@@ -5060,7 +5060,7 @@ CVE_STATUS[CVE-2023-4611] = "fixed-version: only affects 6.4rc1 onwards"
5060 5060
5061# CVE-2023-4622 needs backporting (fixed from 6.5rc1) 5061# CVE-2023-4622 needs backporting (fixed from 6.5rc1)
5062 5062
5063# CVE-2023-4623 needs backporting (fixed from 6.1.53) 5063CVE_STATUS[CVE-2023-4623] = "cpe-stable-backport: Backported in 6.1.53"
5064 5064
5065# CVE-2023-4881 needs backporting (fixed from 6.1.54) 5065# CVE-2023-4881 needs backporting (fixed from 6.1.54)
5066 5066
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 () {
14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
15} 15}
16 16
17SRCREV_machine ?= "7327e7ab3b5508182380405a51f2657f5bf669b4" 17SRCREV_machine ?= "af2faa46d440ee11170ba8233eec0f818988f256"
18SRCREV_meta ?= "9e389e7f44a22bc637328f15e106f6d60631780e" 18SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
22 22
23LINUX_VERSION ?= "6.1.52" 23LINUX_VERSION ?= "6.1.53"
24 24
25LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 25LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
26 26
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
8# CVE exclusions 8# CVE exclusions
9include recipes-kernel/linux/cve-exclusion_6.1.inc 9include recipes-kernel/linux/cve-exclusion_6.1.inc
10 10
11LINUX_VERSION ?= "6.1.52" 11LINUX_VERSION ?= "6.1.53"
12LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 12LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
13 13
14DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" 14DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
17KMETA = "kernel-meta" 17KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 20SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
21SRCREV_meta ?= "9e389e7f44a22bc637328f15e106f6d60631780e" 21SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${LINUX_VERSION}+git"
24 24
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"
18KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" 18KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
19KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" 19KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
20 20
21SRCREV_machine:qemuarm ?= "3028542fe5ece9dd32c8e3b9b14b2c9f4c9cafac" 21SRCREV_machine:qemuarm ?= "b11af7d1c8b4337347747977173c878e7672eb15"
22SRCREV_machine:qemuarm64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 22SRCREV_machine:qemuarm64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
23SRCREV_machine:qemuloongarch64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 23SRCREV_machine:qemuloongarch64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
24SRCREV_machine:qemumips ?= "33c0b5a0c1af6abb4dee11ffa5ece66ffd01d3c8" 24SRCREV_machine:qemumips ?= "81af09853cc4318fad59e780c830c9cc8ccdc898"
25SRCREV_machine:qemuppc ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 25SRCREV_machine:qemuppc ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
26SRCREV_machine:qemuriscv64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 26SRCREV_machine:qemuriscv64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
27SRCREV_machine:qemuriscv32 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 27SRCREV_machine:qemuriscv32 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
28SRCREV_machine:qemux86 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 28SRCREV_machine:qemux86 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
29SRCREV_machine:qemux86-64 ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 29SRCREV_machine:qemux86-64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
30SRCREV_machine:qemumips64 ?= "ee418f38dbc9794b7976ad11fd74f5a3490c7c5e" 30SRCREV_machine:qemumips64 ?= "6ec5ef2f6fa90a5823e131805845738453bc553a"
31SRCREV_machine ?= "b3879adf00e338e66e92431a434fa2549ac88b83" 31SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695"
32SRCREV_meta ?= "9e389e7f44a22bc637328f15e106f6d60631780e" 32SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc"
33 33
34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
35# get the <version>/base branch, which is pure upstream -stable, and the same 35# get the <version>/base branch, which is pure upstream -stable, and the same
36# meta SRCREV as the linux-yocto-standard builds. Select your version using the 36# meta SRCREV as the linux-yocto-standard builds. Select your version using the
37# normal PREFERRED_VERSION settings. 37# normal PREFERRED_VERSION settings.
38BBCLASSEXTEND = "devupstream:target" 38BBCLASSEXTEND = "devupstream:target"
39SRCREV_machine:class-devupstream ?= "59b13c2b647e464dd85622c89d7f16c15d681e96" 39SRCREV_machine:class-devupstream ?= "09045dae0d902f9f78901a26c7ff1714976a38f9"
40PN:class-devupstream = "linux-yocto-upstream" 40PN:class-devupstream = "linux-yocto-upstream"
41KBRANCH:class-devupstream = "v6.1/base" 41KBRANCH:class-devupstream = "v6.1/base"
42 42
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
45SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" 45SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
46 46
47LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 47LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
48LINUX_VERSION ?= "6.1.52" 48LINUX_VERSION ?= "6.1.53"
49 49
50PV = "${LINUX_VERSION}+git" 50PV = "${LINUX_VERSION}+git"
51 51