diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-11-18 17:28:58 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-22 12:26:46 +0000 |
commit | 1790fd2237d77f69c0cf146b9e2abcb24df92f19 (patch) | |
tree | 774c679768e83c368d4429ba08b85a47f92471e0 | |
parent | 049b17187677f205e921c5aa451114ed86f4db58 (diff) | |
download | poky-1790fd2237d77f69c0cf146b9e2abcb24df92f19.tar.gz |
linux-yocto/5.15: fix CONFIG_CRYPTO_CCM mismatch warnings
Integrating the following commit(s) to linux-yocto/.:
f475b1a9ded qat: fix CONFIG_CRYPTO_CCM mismatch warnings
(From OE-Core rev: a3417ce85e38d514c7dc43c2ddcdacf45996fc2a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index f80cabe55d..fc1ccd9b39 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "a0d36398b257c555381e735cd721cd8479d6762d" | 14 | SRCREV_machine ?= "a0d36398b257c555381e735cd721cd8479d6762d" |
15 | SRCREV_meta ?= "5ca1021282e796e2427f8c7769af524c433fb39d" | 15 | SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" |
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.15;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index c09f51ce61..087c30b5a5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
@@ -15,7 +15,7 @@ KMETA = "kernel-meta" | |||
15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
16 | 16 | ||
17 | SRCREV_machine ?= "1c3448ff6cc6d24d16c6ef6065cb642245cac627" | 17 | SRCREV_machine ?= "1c3448ff6cc6d24d16c6ef6065cb642245cac627" |
18 | SRCREV_meta ?= "5ca1021282e796e2427f8c7769af524c433fb39d" | 18 | SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" |
19 | 19 | ||
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
21 | 21 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 710accc9e2..d5f21daf35 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | |||
23 | SRCREV_machine:qemux86-64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | 23 | SRCREV_machine:qemux86-64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" |
24 | SRCREV_machine:qemumips64 ?= "ae8ab2e3acaf9e14cd75a6c96f1ba43c66a1babd" | 24 | SRCREV_machine:qemumips64 ?= "ae8ab2e3acaf9e14cd75a6c96f1ba43c66a1babd" |
25 | SRCREV_machine ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | 25 | SRCREV_machine ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" |
26 | SRCREV_meta ?= "5ca1021282e796e2427f8c7769af524c433fb39d" | 26 | SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" |
27 | 27 | ||
28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |