diff options
-rw-r--r-- | meta/recipes-kernel/linux/cve-exclusion_6.1.inc | 10 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 |
4 files changed, 25 insertions, 25 deletions
diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc index f7316251a7..88c7e4589a 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:25:44.111735+00:00 for version 6.1.53 | 3 | # Generated at 2023-09-30 07:26:16.988526+00:00 for version 6.1.55 |
4 | 4 | ||
5 | python check_kernel_cve_status_version() { | 5 | python check_kernel_cve_status_version() { |
6 | this_version = "6.1.53" | 6 | this_version = "6.1.55" |
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)) |
@@ -5040,7 +5040,7 @@ CVE_STATUS[CVE-2023-42752] = "cpe-stable-backport: Backported in 6.1.53" | |||
5040 | 5040 | ||
5041 | CVE_STATUS[CVE-2023-42753] = "cpe-stable-backport: Backported in 6.1.53" | 5041 | CVE_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_STATUS[CVE-2023-42755] = "cpe-stable-backport: Backported in 6.1.55" |
5044 | 5044 | ||
5045 | CVE_STATUS[CVE-2023-4385] = "fixed-version: Fixed from version 5.19rc1" | 5045 | CVE_STATUS[CVE-2023-4385] = "fixed-version: Fixed from version 5.19rc1" |
5046 | 5046 | ||
@@ -5062,9 +5062,9 @@ CVE_STATUS[CVE-2023-4611] = "fixed-version: only affects 6.4rc1 onwards" | |||
5062 | 5062 | ||
5063 | CVE_STATUS[CVE-2023-4623] = "cpe-stable-backport: Backported in 6.1.53" | 5063 | CVE_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_STATUS[CVE-2023-4881] = "cpe-stable-backport: Backported in 6.1.54" |
5066 | 5066 | ||
5067 | # CVE-2023-4921 needs backporting (fixed from 6.1.54) | 5067 | CVE_STATUS[CVE-2023-4921] = "cpe-stable-backport: Backported in 6.1.54" |
5068 | 5068 | ||
5069 | # CVE-2023-5158 has no known resolution | 5069 | # CVE-2023-5158 has no known resolution |
5070 | 5070 | ||
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 4168a936bb..fd04c4c17a 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 | ||
17 | SRCREV_machine ?= "af2faa46d440ee11170ba8233eec0f818988f256" | 17 | SRCREV_machine ?= "4b3040c1dc13aaac356ad4ef45a8926118c732d0" |
18 | SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" | 18 | SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_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 | ||
23 | LINUX_VERSION ?= "6.1.53" | 23 | LINUX_VERSION ?= "6.1.55" |
24 | 24 | ||
25 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 25 | LIC_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 80a3f06eee..818c650368 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 |
9 | include recipes-kernel/linux/cve-exclusion_6.1.inc | 9 | include recipes-kernel/linux/cve-exclusion_6.1.inc |
10 | 10 | ||
11 | LINUX_VERSION ?= "6.1.53" | 11 | LINUX_VERSION ?= "6.1.55" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
13 | 13 | ||
14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | 14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" |
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
17 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 20 | SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
21 | SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" | 21 | SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${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 61f3e532fb..a942d0c540 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" | |||
18 | KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" | 18 | KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" |
19 | KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" | 19 | KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" |
20 | 20 | ||
21 | SRCREV_machine:qemuarm ?= "b11af7d1c8b4337347747977173c878e7672eb15" | 21 | SRCREV_machine:qemuarm ?= "cf771f6d6bc0344e048bdbf7d23d3aacbe3556d0" |
22 | SRCREV_machine:qemuarm64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 22 | SRCREV_machine:qemuarm64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
23 | SRCREV_machine:qemuloongarch64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 23 | SRCREV_machine:qemuloongarch64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
24 | SRCREV_machine:qemumips ?= "81af09853cc4318fad59e780c830c9cc8ccdc898" | 24 | SRCREV_machine:qemumips ?= "4be1dcc270e6ddeea513af01d91ea3b48ec82470" |
25 | SRCREV_machine:qemuppc ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 25 | SRCREV_machine:qemuppc ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
26 | SRCREV_machine:qemuriscv64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 26 | SRCREV_machine:qemuriscv64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
27 | SRCREV_machine:qemuriscv32 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 27 | SRCREV_machine:qemuriscv32 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
28 | SRCREV_machine:qemux86 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 28 | SRCREV_machine:qemux86 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
29 | SRCREV_machine:qemux86-64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 29 | SRCREV_machine:qemux86-64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
30 | SRCREV_machine:qemumips64 ?= "6ec5ef2f6fa90a5823e131805845738453bc553a" | 30 | SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" |
31 | SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" | 31 | SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
32 | SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" | 32 | SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" |
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. |
38 | BBCLASSEXTEND = "devupstream:target" | 38 | BBCLASSEXTEND = "devupstream:target" |
39 | SRCREV_machine:class-devupstream ?= "09045dae0d902f9f78901a26c7ff1714976a38f9" | 39 | SRCREV_machine:class-devupstream ?= "d23900f974e0fb995b36ef47283a5aa74ca25f51" |
40 | PN:class-devupstream = "linux-yocto-upstream" | 40 | PN:class-devupstream = "linux-yocto-upstream" |
41 | KBRANCH:class-devupstream = "v6.1/base" | 41 | KBRANCH:class-devupstream = "v6.1/base" |
42 | 42 | ||
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA | |||
45 | SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" | 45 | SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" |
46 | 46 | ||
47 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 47 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
48 | LINUX_VERSION ?= "6.1.53" | 48 | LINUX_VERSION ?= "6.1.55" |
49 | 49 | ||
50 | PV = "${LINUX_VERSION}+git" | 50 | PV = "${LINUX_VERSION}+git" |
51 | 51 | ||