From bb983b8f80c0dd33ae00a75b91a4cc5a10120aa9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 3 Aug 2020 08:30:26 -0400 Subject: linux-yocto/5.4: fix perf build with binutils 2.35 Integrating the following commit(s) to linux-yocto/5.4: 1fe4ee7f680c libtraceevent: Fix build with binutils 2.35 (From OE-Core rev: 69faa62d840330f573101245e0aa3fed17984b70) 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(-) 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 1bff5f45ec..c7e468671b 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 ?= "8f1dfb355fc1dbbba06c5dd7d94ddb313b56b88f" +SRCREV_machine ?= "ffd6790852ee25869539fdcabc7b89fb11743c0a" SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" 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 e126968373..62e413e902 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 ?= "1930155dd075918f317d00ce6b190306ebf3a794" -SRCREV_machine ?= "ca698a8d9c4af186ffac417a3632351bac498971" +SRCREV_machine_qemuarm ?= "a64c0668d850dcd447004c41347497a4ff814476" +SRCREV_machine ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" 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 5489e917ea..d3fb451340 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 ?= "420ba5a7bfcd58536e7df52eb434d9ffbddbcbe5" -SRCREV_machine_qemuarm64 ?= "ca698a8d9c4af186ffac417a3632351bac498971" -SRCREV_machine_qemumips ?= "f621e48d6e00b26d51069eeae64f2bb479afcafc" -SRCREV_machine_qemuppc ?= "ca698a8d9c4af186ffac417a3632351bac498971" -SRCREV_machine_qemuriscv64 ?= "ca698a8d9c4af186ffac417a3632351bac498971" -SRCREV_machine_qemux86 ?= "ca698a8d9c4af186ffac417a3632351bac498971" -SRCREV_machine_qemux86-64 ?= "ca698a8d9c4af186ffac417a3632351bac498971" -SRCREV_machine_qemumips64 ?= "4bf6fb25f1d73cae1486a4782bd52082ccc6715e" -SRCREV_machine ?= "ca698a8d9c4af186ffac417a3632351bac498971" +SRCREV_machine_qemuarm ?= "4b2316e7867e7ebc4c5354c7f5c0076dc57b9541" +SRCREV_machine_qemuarm64 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" +SRCREV_machine_qemumips ?= "1b740d5443ea367eae0b2ec71eb25964c10cebec" +SRCREV_machine_qemuppc ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" +SRCREV_machine_qemuriscv64 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" +SRCREV_machine_qemux86 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" +SRCREV_machine_qemux86-64 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" +SRCREV_machine_qemumips64 ?= "21a0d1ffcc340dcfe1e94afdc36870c6824b1112" +SRCREV_machine ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" # remap qemuarm to qemuarma15 for the 5.4 kernel -- cgit v1.2.3-54-g00ecf