From f034379238f980a8c5ec4295288448eab2a3d015 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 18 Nov 2020 10:42:21 -0600 Subject: Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470"" This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673. A fix has been put up for openbmc/openbmc#3720 so we can bring this back now Signed-off-by: Andrew Geissler Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6 --- .../recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +++--- .../recipes-kernel/linux/linux-yocto-rt_5.8.bb | 6 +++--- .../recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 ++++---- .../recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 8 ++++---- poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++++----------- poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb | 22 +++++++++++----------- 6 files changed, 36 insertions(+), 36 deletions(-) (limited to 'poky/meta/recipes-kernel') diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index eded625bff..13f7246f46 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "1d9e25c4f35155580cef313ff2a76de545124a1d" -SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" +SRCREV_machine ?= "3a5f7e9a874f0a6e9ad599b4fc6c491db231dd6f" +SRCREV_meta ?= "7f765dcb29003bafc9c0ac770147940be6c420b2" 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}" -LINUX_VERSION ?= "5.4.65" +LINUX_VERSION ?= "5.4.69" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb index aa01f06d38..3d6d750c86 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_meta ?= "ffbfe61a194537689c782b20da185e7e4daa9ef9" +SRCREV_machine ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_meta ?= "34775c20bc4f4ac32ac7eded79f9dc8ca77e4277" 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.8;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.8.9" +LINUX_VERSION ?= "5.8.13" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 853fc93694..00e1b65782 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.65" +LINUX_VERSION ?= "5.4.69" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "bb77791bc00cfa70211dd238d312b4db950c0808" -SRCREV_machine ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" +SRCREV_machine_qemuarm ?= "58f39df46d9daf12a095ffe225032ec325612960" +SRCREV_machine ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_meta ?= "7f765dcb29003bafc9c0ac770147940be6c420b2" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb index 76b61222a8..764264f637 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.8.9" +LINUX_VERSION ?= "5.8.13" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "830cb9af40e856615b7a435a4fac57b748ba56d6" -SRCREV_machine ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_meta ?= "ffbfe61a194537689c782b20da185e7e4daa9ef9" +SRCREV_machine_qemuarm ?= "627cc1717f47c4d9bc9d58f88b1764990d982a99" +SRCREV_machine ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_meta ?= "34775c20bc4f4ac32ac7eded79f9dc8ca77e4277" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb index d06d653d71..bcc5003268 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "894e63d3256613faa39931a6ae505cfd196df067" -SRCREV_machine_qemuarm64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemumips ?= "aa13fdb2c5f8c4e4e432bfee6df9c8f76ec8ac70" -SRCREV_machine_qemuppc ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemuriscv64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemux86 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemux86-64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemumips64 ?= "4fb21d604fc54db63221ea28ab90622c29d74202" -SRCREV_machine ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" +SRCREV_machine_qemuarm ?= "561d4f6eb1de32e1448451db86656826cf406eb5" +SRCREV_machine_qemuarm64 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_qemumips ?= "e421f3f2399c153c4d58241cb6d1be926f7efc45" +SRCREV_machine_qemuppc ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_qemuriscv64 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_qemux86 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_qemux86-64 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_qemumips64 ?= "72d2f11b5f171e196d6b9824b82575d9a7b59e6f" +SRCREV_machine ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_meta ?= "7f765dcb29003bafc9c0ac770147940be6c420b2" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.65" +LINUX_VERSION ?= "5.4.69" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb index f8e72533f0..f80ae2359b 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.8/standard/base" KBRANCH_qemux86-64 ?= "v5.8/standard/base" KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "d351bf87c9c0e96a1f27f87f16d298bc4470e0b5" -SRCREV_machine_qemuarm64 ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_machine_qemumips ?= "93d29a70890b19fb5482ebcab5f3a49301851daf" -SRCREV_machine_qemuppc ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_machine_qemuriscv64 ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_machine_qemux86 ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_machine_qemux86-64 ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_machine_qemumips64 ?= "4faa049b6b7b51c5d12d20c5e9fcf8e0a3ba8d42" -SRCREV_machine ?= "31fafe701e2adec65d2b2a74a3e592a358915c67" -SRCREV_meta ?= "ffbfe61a194537689c782b20da185e7e4daa9ef9" +SRCREV_machine_qemuarm ?= "41542e01d0deb5a38c190809f4fd01a442769938" +SRCREV_machine_qemuarm64 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_machine_qemumips ?= "36e642d5b6c5b1d05f6172a75df172ad8fefc30b" +SRCREV_machine_qemuppc ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_machine_qemuriscv64 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_machine_qemux86 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_machine_qemux86-64 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_machine_qemumips64 ?= "5538a54afd2525803729c85a40609cae292cb242" +SRCREV_machine ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_meta ?= "34775c20bc4f4ac32ac7eded79f9dc8ca77e4277" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.8;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.8.9" +LINUX_VERSION ?= "5.8.13" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- cgit v1.2.3