diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-01-08 19:38:54 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 23:37:05 +0000 |
commit | fd8bc329dc17f4cfd6ac7803db9c2abd956027b6 (patch) | |
tree | 79ec26748155b318206133e204d347d1f95f0950 | |
parent | 35ade176ff1363dd5ccb76e8fdcf62127af153f3 (diff) | |
download | poky-fd8bc329dc17f4cfd6ac7803db9c2abd956027b6.tar.gz |
linux-yocto/5.15: fix perf build with clang
Integrating the following commit(s) to linux-yocto/5.15:
4c5a089621a8 perf python: Account for multiple words in CC
(From OE-Core rev: 9125916666e1d160b10edcb31f4306d20ce9cdd3)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1cf78a856beb42a2d68e6c49bfdbc33fea68ebb5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index bd57d7c47e..63294f5bb6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
@@ -11,8 +11,8 @@ 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 ?= "9860fe27332e09dd4f0f3b303e40377de083be9a" | 14 | SRCREV_machine ?= "dcd3b533c5f6bc4698d5b09aa83ce9a4695df3b0" |
15 | SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" | 15 | SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" |
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 \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 8b83b5a8de..12e462228f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
14 | KMETA = "kernel-meta" | 14 | KMETA = "kernel-meta" |
15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
16 | 16 | ||
17 | SRCREV_machine ?= "86627fc3da74aefec1338724a597356e6b8ad88b" | 17 | SRCREV_machine ?= "c7e10f06a33a546bcdd0b2e2909459b7572b5443" |
18 | SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" | 18 | SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" |
19 | 19 | ||
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
21 | 21 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 0b373c40fe..4e341713f6 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
@@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" | |||
13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" |
14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine:qemuarm ?= "4915b05912ee7d15224eb9064ca63678f0bc6815" | 16 | SRCREV_machine:qemuarm ?= "e5f2cf3560139bbaad54796c323d60e66cc19374" |
17 | SRCREV_machine:qemuarm64 ?= "660bf605998f60fd77f24d3316b95b14ef2fa035" | 17 | SRCREV_machine:qemuarm64 ?= "d8835a4d4e9d4ea835316cd1843d62e30c5fef33" |
18 | SRCREV_machine:qemumips ?= "38bf282c052b70c1c6dd79dc6ae49da1ec1c7de8" | 18 | SRCREV_machine:qemumips ?= "0f802d6525c21abe586c833074fece3e665a9ed9" |
19 | SRCREV_machine:qemuppc ?= "ac4a5d99364cede21dc1838213f7fb29e1735969" | 19 | SRCREV_machine:qemuppc ?= "84f529230ca9f2ec20517821f7422d62e43ab808" |
20 | SRCREV_machine:qemuriscv64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" | 20 | SRCREV_machine:qemuriscv64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" |
21 | SRCREV_machine:qemuriscv32 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" | 21 | SRCREV_machine:qemuriscv32 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" |
22 | SRCREV_machine:qemux86 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" | 22 | SRCREV_machine:qemux86 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" |
23 | SRCREV_machine:qemux86-64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" | 23 | SRCREV_machine:qemux86-64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" |
24 | SRCREV_machine:qemumips64 ?= "2923c39cc815e2109c9bfc0985adcd8d342fc415" | 24 | SRCREV_machine:qemumips64 ?= "ea2140a5f0cf7b8351982f60d3b30a4657ab0919" |
25 | SRCREV_machine ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" | 25 | SRCREV_machine ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" |
26 | SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" | 26 | SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" |
27 | 27 | ||
28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |