diff --git a/SystemReady-devicetree-band/README.md b/SystemReady-devicetree-band/README.md index 657f00ea..da8768dc 100644 --- a/SystemReady-devicetree-band/README.md +++ b/SystemReady-devicetree-band/README.md @@ -50,7 +50,7 @@ The SystemReady-devicetree band compliance and testing requirements are specifie | Component | Version | |-----------------------------------------------------------------------------|-------------------| -| [Linux Kernel](https://git.yoctoproject.org/linux-yocto/) | v6.16 | +| [Linux Kernel](https://git.yoctoproject.org/linux-yocto/) | v6.18 | | [EDK2](https://github.com/tianocore/edk2.git) | edk2-stable202508 | | [DT bindings source](https://cdn.kernel.org/pub/linux/kernel/v6.x/) | v6.18 | diff --git a/SystemReady-devicetree-band/Yocto/build-scripts/get_source.sh b/SystemReady-devicetree-band/Yocto/build-scripts/get_source.sh index c2bee513..050c842e 100755 --- a/SystemReady-devicetree-band/Yocto/build-scripts/get_source.sh +++ b/SystemReady-devicetree-band/Yocto/build-scripts/get_source.sh @@ -77,7 +77,7 @@ copy_recipes() rm $TOP_DIR/meta-woden/poky/meta/recipes-kernel/linux/linux-yocto_6.6.bb #Increase the initramfs size to hold more storage drivers in ACS image - sed -i 's/INITRAMFS_MAXSIZE ??= "131072"/INITRAMFS_MAXSIZE ??= "190000"/' $TOP_DIR/meta-woden/poky/meta/conf/bitbake.conf + sed -i 's/INITRAMFS_MAXSIZE ??= "131072"/INITRAMFS_MAXSIZE ??= "193000"/' $TOP_DIR/meta-woden/poky/meta/conf/bitbake.conf #copy linux_yocto.bbappend with empty defconfig diff --git a/SystemReady-devicetree-band/Yocto/meta-woden/conf/distro/woden.conf b/SystemReady-devicetree-band/Yocto/meta-woden/conf/distro/woden.conf index b4e27e76..90e6e76e 100644 --- a/SystemReady-devicetree-band/Yocto/meta-woden/conf/distro/woden.conf +++ b/SystemReady-devicetree-band/Yocto/meta-woden/conf/distro/woden.conf @@ -108,7 +108,7 @@ EFI_PROVIDER = "grub-efi" # Suffixing the build directory with the libc is pointless TCLIBCAPPEND = "" -PREFERRED_VERSION_linux-yocto = "6.16%" +PREFERRED_VERSION_linux-yocto = "6.18%" PREFERRED_VERSION_fwts = "26.01.00" PREFERRED_VERSION_python3-dtschema = "2025.2" PREFERRED_VERSION_grub = "2.06" diff --git a/SystemReady-devicetree-band/Yocto/meta-woden/recipes-kernel/linux/linux-yocto_6.18.bb b/SystemReady-devicetree-band/Yocto/meta-woden/recipes-kernel/linux/linux-yocto_6.18.bb new file mode 100644 index 00000000..2c4792ab --- /dev/null +++ b/SystemReady-devicetree-band/Yocto/meta-woden/recipes-kernel/linux/linux-yocto_6.18.bb @@ -0,0 +1,81 @@ +KBRANCH ?= "v6.18/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.18.inc + +# board specific branches +KBRANCH:qemuarm ?= "v6.18/standard/arm-versatile-926ejs" +KBRANCH:qemuarm64 ?= "v6.18/standard/base" +KBRANCH:qemumips ?= "v6.18/standard/mti-malta" +KBRANCH:qemuppc ?= "v6.18/standard/qemuppc" +KBRANCH:qemuriscv64 ?= "v6.18/standard/base" +KBRANCH:qemuriscv32 ?= "v6.18/standard/base" +KBRANCH:qemux86 ?= "v6.18/standard/base" +KBRANCH:qemux86-64 ?= "v6.18/standard/base" +KBRANCH:qemuloongarch64 ?= "v6.18/standard/base" +KBRANCH:qemumips64 ?= "v6.18/standard/mti-malta" + +SRCREV_machine:qemuarm ?= "ee78c602479902ccc042f3b2c6467a6a1b2010e1" +SRCREV_machine:qemuarm64 ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_machine:qemuloongarch64 ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_machine:qemumips ?= "62ea92a539f58803a222be98b81118403074206e" +SRCREV_machine:qemuppc ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_machine:qemuriscv64 ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_machine:qemuriscv32 ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_machine:qemux86 ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_machine:qemux86-64 ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_machine:qemumips64 ?= "9fb4ff0187c85426f21fd40d4c61b742800f65c4" +SRCREV_machine ?= "3e243d2a1151b1ccb42f80f81c6d77f0af327a3d" +SRCREV_meta ?= "1fbfcbd8a3ce8df814f51ef8710fc0197ff01986" + +# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll +# get the /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 ?= "b6fe42bc55af3fb17c8c03def2f8a1f7fa907af6" +PN:class-devupstream = "linux-yocto-upstream" +KBRANCH:class-devupstream = "v6.18/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.18;destsuffix=${KMETA};protocol=https \ + file://0001-disable-psci-checker.patch;patch=1 " + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +LINUX_VERSION ?= "6.18.6" + +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" +# Do not add debug info for riscv32, it fails during depmod +# ERROR: modpost: __ex_table+0x17a4 references non-executable section '.debug_loclists' +# Check again during next major version upgrade +KERNEL_FEATURES:remove:riscv32 = "features/debug/debug-kernel.scc" +INSANE_SKIP:kernel-vmlinux:qemuppc64 = "textrel" +do_kernel_configcheck[noexec] = "1" \ No newline at end of file diff --git a/common/config/systemready-dt-band-source.cfg b/common/config/systemready-dt-band-source.cfg index 80095cbb..3c177257 100644 --- a/common/config/systemready-dt-band-source.cfg +++ b/common/config/systemready-dt-band-source.cfg @@ -37,7 +37,7 @@ # Linux kernel build tag/commit # SRC: https://git.yoctoproject.org/linux-yocto/ -LINUX_KERNEL_VERSION=6.16 +LINUX_KERNEL_VERSION=6.18 # EDK2 build tag/commit # SRC: https://github.com/tianocore/edk2.git