From 8dfaf1abe9f2292b5c357a62d6fa4c0660a5c47c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 21 Feb 2020 12:45:58 -0500 Subject: linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix Bumping the SRCREVs to pickup the VDSO fix by Victor Kamensky. We need it to avoid segfaults in SDK testing as well as the standard mips image test cases. 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 | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'meta/recipes-kernel/linux') 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 ab93f1bf55..94a8e052e7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "a9334277f632a96eca9d037e9bc077a855d0908d" +SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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 097357d9c0..622f5e60c0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" 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 0b2a2305f1..feb89780ea 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" -SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" -SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" +SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" +SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel -- cgit 1.2.3-korg