From 6956beda17862d81084e1b03ec0cc1f6c5e72fd5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 24 Aug 2020 15:00:40 -0400 Subject: linux-yocto/5.8: selftests/bpf: Prevent runqslower from racing on building bpftool Integrating the following commit(s) to linux-yocto/5.8: 912adf166eb0 selftests/bpf: Prevent runqslower from racing on building bpftool (From OE-Core rev: 57ffe4d073d27f410dbf0ac57ff6e4dcea8ab1e4) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.8.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.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb index ca791a3b14..b2d4995474 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3" SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb index ed07f6d9d7..847b2623d6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "01ca9ab2d6cb0de4425d9dfca99dff30653083d9" -SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine_qemuarm ?= "a463c9ee9da138e9fd6f602b5a18352ddd241fbd" +SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3" SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/meta/recipes-kernel/linux/linux-yocto_5.8.bb index b10554af87..86f3e851f7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.8.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.8/standard/base" KBRANCH_qemux86-64 ?= "v5.8/standard/base" KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "3c532d32043dbe90c159f334d8c4232ca67537cd" -SRCREV_machine_qemuarm64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" -SRCREV_machine_qemumips ?= "de93c804ee2e77d32e8a103a68ef19df6947757f" -SRCREV_machine_qemuppc ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" -SRCREV_machine_qemuriscv64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" -SRCREV_machine_qemux86 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" -SRCREV_machine_qemux86-64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" -SRCREV_machine_qemumips64 ?= "3109e6f363109f0dd4bd6a8647f639e445c533f2" -SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine_qemuarm ?= "cdc1a8a82f795aa0bcf60744109798a7cea5816f" +SRCREV_machine_qemuarm64 ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_qemumips ?= "b71b28c3ef58e2db03ab3eb6c576a1e9fda7f181" +SRCREV_machine_qemuppc ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_qemuriscv64 ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_qemux86 ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_qemux86-64 ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_qemumips64 ?= "21530680430bfb9f8a73fba97e6734bd4869a690" +SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3" SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b" # remap qemuarm to qemuarma15 for the 5.8 kernel -- cgit v1.2.3-54-g00ecf