diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-28 09:47:59 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-12 16:44:05 +0100 |
| commit | eccb29aba006ed7d608ebb297f965cc3b5f02c2d (patch) | |
| tree | ed9004d3a8a4d5f04293e092e285e66a9559c5a3 | |
| parent | c9896633c2409f78dea994762c7d9557ace07c37 (diff) | |
| download | poky-eccb29aba006ed7d608ebb297f965cc3b5f02c2d.tar.gz | |
linux-yocto: enable powerpc debug fragment
gcc12 generates some warnings with arch/powerpc, and we know that
these warnings are understood/non-fatal at runtime.
This fragment allows testing to continue, while upstream powerpc
looks at removing warnings.
We only enable it for 5.10/5.15 standard kernels for now, since
this gets us enough coverage to continue working with gcc12.
(From OE-Core rev: b52d50e00d00df3a3a8263a6b5ef04e22a9c93fb)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 992d9d41642981152a387fe59733cc6a77ea3528)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 3048a3e66b..4c55a27abf 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
| @@ -12,7 +12,7 @@ python () { | |||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | SRCREV_machine ?= "bd6e7290bc766ef13e42a1e37f75e6e708b4e317" | 14 | SRCREV_machine ?= "bd6e7290bc766ef13e42a1e37f75e6e708b4e317" |
| 15 | SRCREV_meta ?= "2311a54750b6d9e0315e4f316b640e4e73945342" | 15 | SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee" |
| 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.10;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
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 5cc1bdbff9..d3d277b172 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
| @@ -12,7 +12,7 @@ python () { | |||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | SRCREV_machine ?= "21f94b6c9601dbb03036d539482471ddbe753626" | 14 | SRCREV_machine ?= "21f94b6c9601dbb03036d539482471ddbe753626" |
| 15 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" | 15 | SRCREV_meta ?= "7e73214eee6728b7984d12bead8ad3af2ce06db9" |
| 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.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index d37d39488e..42d5c105b7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
| @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
| 17 | 17 | ||
| 18 | SRCREV_machine:qemuarm ?= "ab911ca906ec6d1551ba12373d4133ccaf7f83cc" | 18 | SRCREV_machine:qemuarm ?= "ab911ca906ec6d1551ba12373d4133ccaf7f83cc" |
| 19 | SRCREV_machine ?= "aadc46b05e5c77328bd3461578c770af3efa8944" | 19 | SRCREV_machine ?= "aadc46b05e5c77328bd3461578c770af3efa8944" |
| 20 | SRCREV_meta ?= "2311a54750b6d9e0315e4f316b640e4e73945342" | 20 | SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee" |
| 21 | 21 | ||
| 22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 23 | 23 | ||
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 9c9d513f83..afb330e922 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
| @@ -15,7 +15,7 @@ KMETA = "kernel-meta" | |||
| 15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "2521f8951adffad70d844209b73cd8d8878710f1" | 17 | SRCREV_machine ?= "2521f8951adffad70d844209b73cd8d8878710f1" |
| 18 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" | 18 | SRCREV_meta ?= "7e73214eee6728b7984d12bead8ad3af2ce06db9" |
| 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.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 19ac04ae48..b60f3e0773 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
| @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" | |||
| 23 | SRCREV_machine:qemux86-64 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" | 23 | SRCREV_machine:qemux86-64 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" |
| 24 | SRCREV_machine:qemumips64 ?= "a005c07acd278c86ddab4cd8bc7a1bfae4638414" | 24 | SRCREV_machine:qemumips64 ?= "a005c07acd278c86ddab4cd8bc7a1bfae4638414" |
| 25 | SRCREV_machine ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" | 25 | SRCREV_machine ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" |
| 26 | SRCREV_meta ?= "2311a54750b6d9e0315e4f316b640e4e73945342" | 26 | SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee" |
| 27 | 27 | ||
| 28 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 28 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
| 29 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" | 29 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
| @@ -50,6 +50,8 @@ KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" | |||
| 50 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 50 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
| 51 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 51 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
| 52 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 52 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
| 53 | KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc" | ||
| 54 | KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" | ||
| 53 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 55 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
| 54 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 56 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
| 55 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 57 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index d9b09660c2..bf4ea952cf 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
| @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" | |||
| 23 | SRCREV_machine:qemux86-64 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" | 23 | SRCREV_machine:qemux86-64 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" |
| 24 | SRCREV_machine:qemumips64 ?= "0294ba0989f839fb11c41fb887707cb49d20143e" | 24 | SRCREV_machine:qemumips64 ?= "0294ba0989f839fb11c41fb887707cb49d20143e" |
| 25 | SRCREV_machine ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" | 25 | SRCREV_machine ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" |
| 26 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" | 26 | SRCREV_meta ?= "7e73214eee6728b7984d12bead8ad3af2ce06db9" |
| 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 |
| @@ -62,6 +62,8 @@ KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | |||
| 62 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 62 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
| 63 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 63 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
| 64 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 64 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" |
| 65 | KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc" | ||
| 66 | KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" | ||
| 65 | 67 | ||
| 66 | INSANE_SKIP:kernel-vmlinux:qemuppc64 = "textrel" | 68 | INSANE_SKIP:kernel-vmlinux:qemuppc64 = "textrel" |
| 67 | 69 | ||
