diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-11-17 10:24:34 -0500 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-11-30 12:05:57 -1000 |
| commit | bffc59b566368b5435381c460f692a07c36db567 (patch) | |
| tree | 55ebd914a17d3c5f1d691b1da8e28c6c89f6d4e7 /meta | |
| parent | 5405e16eec6d67025e3e2933aeda77d2d97bbee6 (diff) | |
| download | openembedded-core-contrib-bffc59b566368b5435381c460f692a07c36db567.tar.gz | |
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 <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e8df0a1f9607417f3f308b9ff852e287837b6cdf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 | ||||
| -rw-r--r-- | 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 4d84a3ad09..4abde1265e 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 5c908e9d88..7722ef0747 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" |