diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-11-18 17:28:57 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-07 15:02:50 +0000 |
commit | 037ea95f37b1e330732af91f49e38e367f5ae6ad (patch) | |
tree | 009e5c57b993d0136b22291a2d356c2936d27418 /meta/recipes-kernel | |
parent | 3cb63d64f55810bbf937bce4147280e6bdfe4213 (diff) | |
download | poky-037ea95f37b1e330732af91f49e38e367f5ae6ad.tar.gz |
linux-yocto/5.19: fix CONFIG_CRYPTO_CCM mismatch warnings
Integrating the following commit(s) to linux-yocto/.:
0cba9aa4044 qat: fix CONFIG_CRYPTO_CCM mismatch warnings
(From OE-Core rev: bb44f79c4025b16ab054c186546d956c608a8aad)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit a2e40db0d957bc8b7e77e5f54e6646bb633ef42f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.19.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb index 2b12b8b8df..5c316dbaf3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "2bd6711a4dcc49e51ae68152ed0b40384e291554" | 14 | SRCREV_machine ?= "2bd6711a4dcc49e51ae68152ed0b40384e291554" |
15 | SRCREV_meta ?= "7381acde368f24529d8c9face1826fb54bf7feee" | 15 | SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" |
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.19;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.19;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb index 0dd3816dc5..27fa6d9867 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.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 ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" | 17 | SRCREV_machine ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" |
18 | SRCREV_meta ?= "7381acde368f24529d8c9face1826fb54bf7feee" | 18 | SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" |
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.19.bb b/meta/recipes-kernel/linux/linux-yocto_5.19.bb index b242dfa27a..44bb02b9c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.19.bb | |||
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" | |||
23 | SRCREV_machine:qemux86-64 ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" | 23 | SRCREV_machine:qemux86-64 ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" |
24 | SRCREV_machine:qemumips64 ?= "20d5adcd760ffdc90b4e5babb85a07b9d6ff3113" | 24 | SRCREV_machine:qemumips64 ?= "20d5adcd760ffdc90b4e5babb85a07b9d6ff3113" |
25 | SRCREV_machine ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" | 25 | SRCREV_machine ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" |
26 | SRCREV_meta ?= "7381acde368f24529d8c9face1826fb54bf7feee" | 26 | SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" |
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 |