diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-10-04 14:13:51 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-05 21:09:10 +0100 |
commit | d7130dbdd54a1ad7d683e5e3c04d2acc36c01e82 (patch) | |
tree | ef12225769aa781071270394151b463472414d55 /meta | |
parent | 2b9044361f2855866eed831f8bdb770f2c7d42dc (diff) | |
download | poky-d7130dbdd54a1ad7d683e5e3c04d2acc36c01e82.tar.gz |
linux-yocto/6.5: integrate fixes for sanity issues
making the following commits available in our 6.5 kernel:
49e3d8448aea locking/atomic: scripts: fix fallback ifdeffery
9ba8e064374d crypto: jitter - add RCT/APT support for different OSRs
50f59f46583a crypto: jitter - Add clarifying comments to Jitter Entropy RCT cutoff values
Which should address several of the failures we are seeing with
6.5 under integration testing.
(From OE-Core rev: dd8f47a9c4407741575e9264f7c44e4623f606e0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.5.bb | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb index 9b09bae615..f70d77e06a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | |||
@@ -14,7 +14,7 @@ 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 ?= "6efddc0f385fb758e7eef43d9de133b1677eb72c" | 17 | SRCREV_machine ?= "712b8fb1342bf829c9ca1e649adc9d112b9c209f" |
18 | SRCREV_meta ?= "06cf3d8830fda41ff271eec7da6e3c8425df790f" | 18 | SRCREV_meta ?= "06cf3d8830fda41ff271eec7da6e3c8425df790f" |
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 \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb index 5325fbad53..716c922c13 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | |||
@@ -17,7 +17,7 @@ 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 ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 20 | SRCREV_machine ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
21 | SRCREV_meta ?= "06cf3d8830fda41ff271eec7da6e3c8425df790f" | 21 | SRCREV_meta ?= "06cf3d8830fda41ff271eec7da6e3c8425df790f" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb index b9ed4be898..64399e1e8d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb | |||
@@ -18,17 +18,17 @@ KBRANCH:qemux86-64 ?= "v6.5/standard/base" | |||
18 | KBRANCH:qemuloongarch64 ?= "v6.5/standard/base" | 18 | KBRANCH:qemuloongarch64 ?= "v6.5/standard/base" |
19 | KBRANCH:qemumips64 ?= "v6.5/standard/mti-malta64" | 19 | KBRANCH:qemumips64 ?= "v6.5/standard/mti-malta64" |
20 | 20 | ||
21 | SRCREV_machine:qemuarm ?= "619d7b434792c35b501914d481eb3178d87b9f60" | 21 | SRCREV_machine:qemuarm ?= "ff312905898c587e8c8e1b82b59c01b6933c6339" |
22 | SRCREV_machine:qemuarm64 ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 22 | SRCREV_machine:qemuarm64 ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
23 | SRCREV_machine:qemuloongarch64 ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 23 | SRCREV_machine:qemuloongarch64 ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
24 | SRCREV_machine:qemumips ?= "622b9a83a51276528ddd38ec9c239b7ef7eac1ee" | 24 | SRCREV_machine:qemumips ?= "889d009f6f39c91fedb8c7431c2ce649f05a04a9" |
25 | SRCREV_machine:qemuppc ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 25 | SRCREV_machine:qemuppc ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
26 | SRCREV_machine:qemuriscv64 ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 26 | SRCREV_machine:qemuriscv64 ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
27 | SRCREV_machine:qemuriscv32 ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 27 | SRCREV_machine:qemuriscv32 ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
28 | SRCREV_machine:qemux86 ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 28 | SRCREV_machine:qemux86 ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
29 | SRCREV_machine:qemux86-64 ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 29 | SRCREV_machine:qemux86-64 ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
30 | SRCREV_machine:qemumips64 ?= "72909f2a89c5bcd4e8ab9aaab280eb961b4e1282" | 30 | SRCREV_machine:qemumips64 ?= "97c93107649bc6f7fafdf6c3a8b3521f4bfe2246" |
31 | SRCREV_machine ?= "5b2595c3e0dce2912b32ef69aaaacd52cd0e720c" | 31 | SRCREV_machine ?= "49e3d8448aeaecd8e2bb6b481f26b76514dbe0f5" |
32 | SRCREV_meta ?= "06cf3d8830fda41ff271eec7da6e3c8425df790f" | 32 | SRCREV_meta ?= "06cf3d8830fda41ff271eec7da6e3c8425df790f" |
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 |