From 8d8f3a0862d7d997767dc86b6af564883f7f3527 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 10 Dec 2024 16:06:16 -0500 Subject: [PATCH] linux-yocto: drop 6.10 The 6.10 kernel is EOL upstream, and we have moved our default to the v6.12 kernel. (From OE-Core rev: b92bdd7f98b69a8e29e67c436fe6b0a5631c6973) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- .../linux/linux-yocto-rt_6.10.bb | 48 ------------ .../linux/linux-yocto-tiny_6.10.bb | 33 -------- meta/recipes-kernel/linux/linux-yocto_6.10.bb | 76 ------------------- 3 files changed, 157 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_6.10.bb diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb deleted file mode 100644 index 7c0425bb27..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb +++ /dev/null @@ -1,48 +0,0 @@ -KBRANCH ?= "v6.10/standard/preempt-rt/base" - -require recipes-kernel/linux/linux-yocto.inc - -# CVE exclusions -include recipes-kernel/linux/cve-exclusion_6.10.inc - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "3e91e02b6041d6720a5cf2f64323bb9b73f20765" -SRCREV_meta ?= "af06ad75b8da89e99d2cc0090ce2a7877ef51391" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.10;destsuffix=${KMETA};protocol=https" - -LINUX_VERSION ?= "6.10.14" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "1" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)$" - -KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.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("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" -KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb deleted file mode 100644 index 891dcb596a..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb +++ /dev/null @@ -1,33 +0,0 @@ -KBRANCH ?= "v6.10/standard/tiny/base" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -# CVE exclusions -include recipes-kernel/linux/cve-exclusion_6.10.inc - -LINUX_VERSION ?= "6.10.14" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "af06ad75b8da89e99d2cc0090ce2a7877ef51391" - -PV = "${LINUX_VERSION}+git" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.10;destsuffix=${KMETA};protocol=https" - -COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.10.bb b/meta/recipes-kernel/linux/linux-yocto_6.10.bb deleted file mode 100644 index 1d5b8af337..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto_6.10.bb +++ /dev/null @@ -1,76 +0,0 @@ -KBRANCH ?= "v6.10/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.10.inc - -# board specific branches -KBRANCH:qemuarm ?= "v6.10/standard/arm-versatile-926ejs" -KBRANCH:qemuarm64 ?= "v6.10/standard/qemuarm64" -KBRANCH:qemumips ?= "v6.10/standard/mti-malta32" -KBRANCH:qemuppc ?= "v6.10/standard/qemuppc" -KBRANCH:qemuriscv64 ?= "v6.10/standard/base" -KBRANCH:qemuriscv32 ?= "v6.10/standard/base" -KBRANCH:qemux86 ?= "v6.10/standard/base" -KBRANCH:qemux86.104 ?= "v6.10/standard/base" -KBRANCH:qemuloongarch64 ?= "v6.10/standard/base" -KBRANCH:qemumips64 ?= "v6.10/standard/mti-malta64" - -SRCREV_machine:qemuarm ?= "e118779b7d6c0be1ebdf9a1f7c4401a7a2daffe1" -SRCREV_machine:qemuarm64 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_machine:qemuloongarch64 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_machine:qemumips ?= "59775dda87d79c59035b222fd453ff38a2950653" -SRCREV_machine:qemuppc ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_machine:qemuriscv64 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_machine:qemuriscv32 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_machine:qemux86 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_machine:qemux86-64 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_machine:qemumips64 ?= "61cac1396fe9250a4b7a5cc6ae3deb9dda4290c3" -SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "af06ad75b8da89e99d2cc0090ce2a7877ef51391" - -# 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 ?= "47c2f92131c47a37ea0e3d8e1a4e4c82a9b473d4" -PN:class-devupstream = "linux-yocto-upstream" -KBRANCH:class-devupstream = "v6.10/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.10;destsuffix=${KMETA};protocol=https" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.10.14" - -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"