summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-03-04 20:25:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-10 16:39:45 +0000
commita69995f86947e3b974ccb77c85a91b19981208e5 (patch)
tree3d9959631b786528a44b528690bfbefde41437bb
parent89c98169ac1579c98777a03ee50bcabd7842c7c7 (diff)
downloadpoky-a69995f86947e3b974ccb77c85a91b19981208e5.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: 4c6189ba39823fa2db4706f3208e70ae1f5b4860) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a8fcece853475bede5d442120bc38f17751ed9a1) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb2
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 edc1a957bb..ca334a67cc 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
14SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a" 14SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a"
15SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" 15SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_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 5380dcb029..d3bcd594f4 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
18SRCREV_machine_qemuarm ?= "9a8497a8761a22b3086cab63d18698024a69a410" 18SRCREV_machine_qemuarm ?= "9a8497a8761a22b3086cab63d18698024a69a410"
19SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414" 19SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414"
20SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" 20SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${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 d2d1b0bd5a..8b10cfd96a 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"
23SRCREV_machine_qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" 23SRCREV_machine_qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c"
24SRCREV_machine_qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c" 24SRCREV_machine_qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c"
25SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" 25SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c"
26SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" 26SRCREV_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"