diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-03-04 20:25:10 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-05 22:58:48 +0000 |
commit | 2abfa7f8085850d69a6ca861779cf208619b8a31 (patch) | |
tree | df8c645dda0044837e26e69cc0c0eabe6417587e /meta/recipes-kernel | |
parent | 42c37a2228c1e12e5dbde4afff36f4f30cfe0d5a (diff) | |
download | poky-2abfa7f8085850d69a6ca861779cf208619b8a31.tar.gz |
linux-yocto/5.10: features/zram: remove CONFIG_ZRAM_DEF_COMP
Integrating the following commit(s) to linux-yocto/.:
7a012dfacdc features/zram: remove CONFIG_ZRAM_DEF_COMP
(From OE-Core rev: a8fcece853475bede5d442120bc38f17751ed9a1)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 |
3 files changed, 3 insertions, 3 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 8a8a7eabe9..5f512016b2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a" | 14 | SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a" |
15 | SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" | 15 | SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" |
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 bf7662eed3..7a7a13e031 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine:qemuarm ?= "9a8497a8761a22b3086cab63d18698024a69a410" | 18 | SRCREV_machine:qemuarm ?= "9a8497a8761a22b3086cab63d18698024a69a410" |
19 | SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414" | 19 | SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414" |
20 | SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" | 20 | SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" |
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 ecb2d03949..130e3286ce 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" | |||
23 | SRCREV_machine:qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" | 23 | SRCREV_machine:qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" |
24 | SRCREV_machine:qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c" | 24 | SRCREV_machine:qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c" |
25 | SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" | 25 | SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" |
26 | SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" | 26 | SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" |
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" |