diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-05-17 18:16:55 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-20 09:43:39 +0100 |
commit | 183ac49aa2b0d3824b81fcceeec3d5aa26d16a99 (patch) | |
tree | f8237545338a7a8e96323021188419f532eb1a2e /meta | |
parent | 4f550bcfa69d9092be48d8f5bbb5ebee7dcd46c2 (diff) | |
download | poky-183ac49aa2b0d3824b81fcceeec3d5aa26d16a99.tar.gz |
linux-yocto/5.10: ktypes/standard: disable obsolete crypto options by default
Integrating the following commit(s) to linux-yocto/5.10.:
ktypes/standard: disable obsolete crypto options by default
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is on by default, but really
shouldn't be on in our kernels for a safe set of baseline options.
This is almost never used, so we disable it by default. If something
needs it, they can turn it on in a board specific config.
(From OE-Core rev: f506cef3b671a659c9cee30b41591116552f74da)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f29be437290a960decdc2d8be8e505e8179c2f58)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 |
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 69571df047..424dc83e15 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "eb1ac5022eed244fb3943b3e48b48bc863aaf5a3" | 14 | SRCREV_machine ?= "fd84ed4cd5f8671db5ff31c00712c607c379a924" |
15 | SRCREV_meta ?= "50c2d69f24f02336c9c6d65c3201d1d6dd105f52" | 15 | SRCREV_meta ?= "6dbd5491f4b9592d6332fd8e1bcf29ab01901274" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 2e0d1b20d4..ea41d74add 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "5bd2421ef6048de205cd3a86c6f14b6296dc79d9" | 18 | SRCREV_machine_qemuarm ?= "9d4af32a2486acf5feb473b0d5656155cf80f115" |
19 | SRCREV_machine ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 19 | SRCREV_machine ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
20 | SRCREV_meta ?= "50c2d69f24f02336c9c6d65c3201d1d6dd105f52" | 20 | SRCREV_meta ?= "6dbd5491f4b9592d6332fd8e1bcf29ab01901274" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index cf6d19010a..1200cba942 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" | |||
13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" | 13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" |
14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" | 14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine_qemuarm ?= "71d9798b63a9d5a62708f746bb0a53583a8dfb5d" | 16 | SRCREV_machine_qemuarm ?= "f3a20db821a8802c1b3e71c0cccded36d89671b5" |
17 | SRCREV_machine_qemuarm64 ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 17 | SRCREV_machine_qemuarm64 ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
18 | SRCREV_machine_qemumips ?= "4bad40a510831446b777042df43e349989ecbef7" | 18 | SRCREV_machine_qemumips ?= "c64120ac8b71098f6356a992f7e302caa75d4bae" |
19 | SRCREV_machine_qemuppc ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 19 | SRCREV_machine_qemuppc ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
20 | SRCREV_machine_qemuriscv64 ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 20 | SRCREV_machine_qemuriscv64 ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
21 | SRCREV_machine_qemuriscv32 ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 21 | SRCREV_machine_qemuriscv32 ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
22 | SRCREV_machine_qemux86 ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 22 | SRCREV_machine_qemux86 ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
23 | SRCREV_machine_qemux86-64 ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 23 | SRCREV_machine_qemux86-64 ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
24 | SRCREV_machine_qemumips64 ?= "554408244bec4f2121f4ec63b170ca38430b8f9b" | 24 | SRCREV_machine_qemumips64 ?= "b9a0cc14b51ac1bc5f2bcdcc0f53f6913e877e20" |
25 | SRCREV_machine ?= "24719054cf85a9c66df020b10b6d2b7c6926a4e6" | 25 | SRCREV_machine ?= "ddac76981cb3a53de4f2feb2746661a02a6763bd" |
26 | SRCREV_meta ?= "50c2d69f24f02336c9c6d65c3201d1d6dd105f52" | 26 | SRCREV_meta ?= "6dbd5491f4b9592d6332fd8e1bcf29ab01901274" |
27 | 27 | ||
28 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 28 | # remap qemuarm to qemuarma15 for the 5.8 kernel |
29 | # KMACHINE_qemuarm ?= "qemuarma15" | 29 | # KMACHINE_qemuarm ?= "qemuarma15" |