From e8df0a1f9607417f3f308b9ff852e287837b6cdf Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 17 Nov 2020 10:24:34 -0500 Subject: linux-yocto/5.4: config cleanup / warnings Integrating the following commit(s): eadca496e9f bsp/mti-malta64: fix warning of CONFIG_SCSI_VIRTIO on qemumips64 203911bc035 net/l2tp.cfg: fix CONFIG_PPPOL2TP mismatched warnings Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 563f2d5b76..d7e0072a30 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "689799c6846313eb19566dd4afb69d30353dd351" -SRCREV_meta ?= "8df18409861d25d9ca84b80c9ca8181a48f6ee45" +SRCREV_meta ?= "e9a115873f55580929b3cd0232a70652666f5fff" 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.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 9f17d56b6a..44646ebd84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "f37a22c3ddab9db618ad302cce77825dae2cda87" SRCREV_machine ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" -SRCREV_meta ?= "8df18409861d25d9ca84b80c9ca8181a48f6ee45" +SRCREV_meta ?= "e9a115873f55580929b3cd0232a70652666f5fff" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index eb2793c9a2..dea2d515e6 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" SRCREV_machine_qemux86-64 ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" SRCREV_machine_qemumips64 ?= "536bda19159206ac7f60165f71bbf892cb8ad3fd" SRCREV_machine ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" -SRCREV_meta ?= "8df18409861d25d9ca84b80c9ca8181a48f6ee45" +SRCREV_meta ?= "e9a115873f55580929b3cd0232a70652666f5fff" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg