diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-08-03 08:30:26 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-06 15:12:39 +0100 |
commit | bb983b8f80c0dd33ae00a75b91a4cc5a10120aa9 (patch) | |
tree | df30ffadaa5064ddc08093f9bd77fd27d7a638ba /meta/recipes-kernel | |
parent | 64dff5fd186990d1cf329d76c5378dd90ee53a81 (diff) | |
download | poky-bb983b8f80c0dd33ae00a75b91a4cc5a10120aa9.tar.gz |
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 <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 4 | ||||
-rw-r--r-- | 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 () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "8f1dfb355fc1dbbba06c5dd7d94ddb313b56b88f" | 14 | SRCREV_machine ?= "ffd6790852ee25869539fdcabc7b89fb11743c0a" |
15 | SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" | 15 | SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | 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" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "1930155dd075918f317d00ce6b190306ebf3a794" | 18 | SRCREV_machine_qemuarm ?= "a64c0668d850dcd447004c41347497a4ff814476" |
19 | SRCREV_machine ?= "ca698a8d9c4af186ffac417a3632351bac498971" | 19 | SRCREV_machine ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" |
20 | SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" | 20 | SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | 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" | |||
12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" | 12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" |
13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" | 13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" |
14 | 14 | ||
15 | SRCREV_machine_qemuarm ?= "420ba5a7bfcd58536e7df52eb434d9ffbddbcbe5" | 15 | SRCREV_machine_qemuarm ?= "4b2316e7867e7ebc4c5354c7f5c0076dc57b9541" |
16 | SRCREV_machine_qemuarm64 ?= "ca698a8d9c4af186ffac417a3632351bac498971" | 16 | SRCREV_machine_qemuarm64 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" |
17 | SRCREV_machine_qemumips ?= "f621e48d6e00b26d51069eeae64f2bb479afcafc" | 17 | SRCREV_machine_qemumips ?= "1b740d5443ea367eae0b2ec71eb25964c10cebec" |
18 | SRCREV_machine_qemuppc ?= "ca698a8d9c4af186ffac417a3632351bac498971" | 18 | SRCREV_machine_qemuppc ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" |
19 | SRCREV_machine_qemuriscv64 ?= "ca698a8d9c4af186ffac417a3632351bac498971" | 19 | SRCREV_machine_qemuriscv64 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" |
20 | SRCREV_machine_qemux86 ?= "ca698a8d9c4af186ffac417a3632351bac498971" | 20 | SRCREV_machine_qemux86 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" |
21 | SRCREV_machine_qemux86-64 ?= "ca698a8d9c4af186ffac417a3632351bac498971" | 21 | SRCREV_machine_qemux86-64 ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" |
22 | SRCREV_machine_qemumips64 ?= "4bf6fb25f1d73cae1486a4782bd52082ccc6715e" | 22 | SRCREV_machine_qemumips64 ?= "21a0d1ffcc340dcfe1e94afdc36870c6824b1112" |
23 | SRCREV_machine ?= "ca698a8d9c4af186ffac417a3632351bac498971" | 23 | SRCREV_machine ?= "1fe4ee7f680c3f69f620d68a5d2f7341e8db693b" |
24 | SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" | 24 | SRCREV_meta ?= "021a303c35cbd79f67666a8d4c4487751f96cbce" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |