mirror of
https://git.yoctoproject.org/poky
synced 2026-07-27 19:37:10 +00:00
Bruce Ashfield
8df460977d
Integrating the following commit(s) to linux-yocto/6.12:
1/1 [
Author: Khem Raj
Email: raj.khem@gmail.com
Subject: mips: Add '-std=gnu11' to vdso CFLAGS
Date: Wed, 26 Mar 2025 20:24:36 -0700
GCC 15 changed the default C standard dialect from gnu17 to gnu23,
which should not have impacted the kernel because it explicitly requests
the gnu11 standard in the main Makefile. However, mips/vdso code uses
its own CFLAGS without a '-std=' value, which break with this dialect
change because of the kernel's own definitions of bool, false, and true
conflicting with the C23 reserved keywords.
include/linux/stddef.h:11:9: error: cannot use keyword 'false' as enumeration constant
11 | false = 0,
| ^~~~~
include/linux/stddef.h:11:9: note: 'false' is a keyword with '-std=c23' onwards
include/linux/types.h:35:33: error: 'bool' cannot be defined via 'typedef'
35 | typedef _Bool bool;
| ^~~~
include/linux/types.h:35:33: note: 'bool' is a keyword with '-std=c23' onwards
Add '-std=gnu11' to the decompressor and purgatory CFLAGS to eliminate
these errors and make the C standard version of these areas match the
rest of the kernel.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
(From OE-Core rev: 832657740c76c63b2e2e9229eb3934c04a5d5ca1)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
77 lines
4.0 KiB
BlitzBasic
77 lines
4.0 KiB
BlitzBasic
KBRANCH ?= "v6.12/standard/base"
|
|
|
|
require recipes-kernel/linux/linux-yocto.inc
|
|
|
|
# CVE exclusions
|
|
include recipes-kernel/linux/cve-exclusion.inc
|
|
include recipes-kernel/linux/cve-exclusion_6.12.inc
|
|
|
|
# board specific branches
|
|
KBRANCH:qemuarm ?= "v6.12/standard/arm-versatile-926ejs"
|
|
KBRANCH:qemuarm64 ?= "v6.12/standard/base"
|
|
KBRANCH:qemumips ?= "v6.12/standard/mti-malta32"
|
|
KBRANCH:qemuppc ?= "v6.12/standard/qemuppc"
|
|
KBRANCH:qemuriscv64 ?= "v6.12/standard/base"
|
|
KBRANCH:qemuriscv32 ?= "v6.12/standard/base"
|
|
KBRANCH:qemux86 ?= "v6.12/standard/base"
|
|
KBRANCH:qemux86.104 ?= "v6.12/standard/base"
|
|
KBRANCH:qemuloongarch64 ?= "v6.12/standard/base"
|
|
KBRANCH:qemumips64 ?= "v6.12/standard/mti-malta64"
|
|
|
|
SRCREV_machine:qemuarm ?= "3a973aae1addba0ecd7485694d4fcfc624085f24"
|
|
SRCREV_machine:qemuarm64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_machine:qemuloongarch64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_machine:qemumips ?= "fc7877fe6aa5f2a445e17941a5858c7e19a1746d"
|
|
SRCREV_machine:qemuppc ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_machine:qemuriscv64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_machine:qemuriscv32 ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_machine:qemux86 ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_machine:qemux86-64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_machine:qemumips64 ?= "9e2bc57fafb525cb3fbbfab7c7f92bca7e9a43f4"
|
|
SRCREV_machine ?= "2ee7ebed771b39a795c227aae81524175abf5d00"
|
|
SRCREV_meta ?= "d034c1073cb7f88eaf3ce929ba21ba11503729b2"
|
|
|
|
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
|
|
# get the <version>/base branch, which is pure upstream -stable, and the same
|
|
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
|
|
# normal PREFERRED_VERSION settings.
|
|
BBCLASSEXTEND = "devupstream:target"
|
|
SRCREV_machine:class-devupstream ?= "e9cc806c0152fa9993f817cebf42989a3e2530bb"
|
|
PN:class-devupstream = "linux-yocto-upstream"
|
|
KBRANCH:class-devupstream = "v6.12/base"
|
|
|
|
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};protocol=https \
|
|
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.12;destsuffix=${KMETA};protocol=https"
|
|
|
|
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
|
LINUX_VERSION ?= "6.12.19"
|
|
|
|
PV = "${LINUX_VERSION}+git"
|
|
|
|
KMETA = "kernel-meta"
|
|
KCONF_BSP_AUDIT_LEVEL = "1"
|
|
|
|
KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb"
|
|
|
|
COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32|qemuloongarch64)$"
|
|
|
|
# Functionality flags
|
|
KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
|
|
KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
|
|
KERNEL_FEATURES:append:qemuall = " cfg/virtio.scc features/drm-bochs/drm-bochs.scc cfg/net/mdio.scc"
|
|
KERNEL_FEATURES:append:qemux86 = " cfg/sound.scc cfg/paravirt_kvm.scc"
|
|
KERNEL_FEATURES:append:qemux86-64 = " cfg/sound.scc cfg/paravirt_kvm.scc"
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc features/nf_tables/nft_test.scc", "", d)}"
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}"
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("KERNEL_DEBUG", "True", " features/reproducibility/reproducibility.scc features/debug/debug-btf.scc", "", d)}"
|
|
# libteam ptests from meta-oe needs it
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/net/team/team.scc", "", d)}"
|
|
# openl2tp tests from meta-networking needs it
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " cgl/cfg/net/l2tp.scc", "", d)}"
|
|
KERNEL_FEATURES:append:powerpc = " arch/powerpc/powerpc-debug.scc"
|
|
KERNEL_FEATURES:append:powerpc64 = " arch/powerpc/powerpc-debug.scc"
|
|
KERNEL_FEATURES:append:powerpc64le = " arch/powerpc/powerpc-debug.scc"
|
|
|
|
INSANE_SKIP:kernel-vmlinux:qemuppc64 = "textrel"
|