From 4c6189ba39823fa2db4706f3208e70ae1f5b4860 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 4 Mar 2022 20:25:10 -0500 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit a8fcece853475bede5d442120bc38f17751ed9a1) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +- 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 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 () { } SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a" -SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" +SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" SRCREV_machine_qemuarm ?= "9a8497a8761a22b3086cab63d18698024a69a410" SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414" -SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" +SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine_qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" SRCREV_machine_qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c" SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" -SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" +SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg