From 43fec2e807691e8181f8acc9ff148efabd0cfe82 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 15 Jul 2021 15:30:06 -0400 Subject: [PATCH] linux-yocto-rt/5.13: integrate -rt1 -rt1 has been released for 5.13, we integrate those commits to our preempt-rt/* branches. Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../linux/linux-yocto-rt_5.13.bb | 4 ++-- .../linux/linux-yocto-tiny_5.13.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.13.bb | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb index f87ab6bcfd..8dd6791b02 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_meta ?= "ceb5fa598d08902fe2934c041875aa92d9a6fa19" +SRCREV_machine ?= "e60f9507dee72c63193cbafe0a3c754210ff69fc" +SRCREV_meta ?= "f80d46c2e088f4a33430442058aa881b1a31b95c" 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.13;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb index f01133c761..83cfdba568 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "84e5292c5adf2e715e842a9eb3985034941e0798" -SRCREV_machine ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_meta ?= "ceb5fa598d08902fe2934c041875aa92d9a6fa19" +SRCREV_machine_qemuarm ?= "51e261b235385efcee08c4b5489c544fb2935e2a" +SRCREV_machine ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_meta ?= "f80d46c2e088f4a33430442058aa881b1a31b95c" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.13.bb b/meta/recipes-kernel/linux/linux-yocto_5.13.bb index 74699d03ae..a96eab7fdb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.13.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.13.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.13/standard/base" KBRANCH_qemux86-64 ?= "v5.13/standard/base" KBRANCH_qemumips64 ?= "v5.13/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "9c2fd4b59ebf57f1900f82d49d6bf4fe074cf818" -SRCREV_machine_qemuarm64 ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_machine_qemumips ?= "1ea414ef9e3a9744ec09f7ecebcc3b9aeffe39d0" -SRCREV_machine_qemuppc ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_machine_qemuriscv64 ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_machine_qemuriscv32 ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_machine_qemux86 ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_machine_qemux86-64 ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_machine_qemumips64 ?= "b74fe3dcca0653609fcb75aad883b1db07619081" -SRCREV_machine ?= "b1cead8d98582ca687f93e06438543b97144e5bf" -SRCREV_meta ?= "ceb5fa598d08902fe2934c041875aa92d9a6fa19" +SRCREV_machine_qemuarm ?= "60de9ae7ec5086c7aab26fef79c5ee22673e984b" +SRCREV_machine_qemuarm64 ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_machine_qemumips ?= "4ba021f55cd0f90d34d2432de21282e792e6ad06" +SRCREV_machine_qemuppc ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_machine_qemuriscv64 ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_machine_qemuriscv32 ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_machine_qemux86 ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_machine_qemux86-64 ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_machine_qemumips64 ?= "1fb4f7d7204bffe99a86e72b3cffe84c770be3ee" +SRCREV_machine ?= "4fd6245b88c0700dfb7ffd951d5a7cd460935330" +SRCREV_meta ?= "f80d46c2e088f4a33430442058aa881b1a31b95c" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- 2.40.1