Message ID | 20230525122936.2733864-1-richard.purdie@linuxfoundation.org |
---|---|
State | Accepted, archived |
Commit | e30b37776d16cfd4ce7f79746427ccd95b306059 |
Headers | show |
Series | linux-yocto: Drop 5.15 support | expand |
On Thu, May 25, 2023 at 8:29 AM Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > 5.15 doesn't work with gcc 13 and we'll be replacing 5.15 with a new kernel > version later in the release cycle. Drop 5.15 now so we can move forward > with gcc 13 and we'll add a new kernel version later. > Fine with me. I'll continue sending -stable updates for 5.15 for the released branches. linux-yocto-dev is currently testing the 6.4-rc series, so depending on where the kernel release cycles land, we'll be 6.4 or 6.5 for the "new" kernel in the release. Bruce > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > .../linux/linux-yocto-rt_5.15.bb | 45 ------------ > .../linux/linux-yocto-tiny_5.15.bb | 30 -------- > meta/recipes-kernel/linux/linux-yocto_5.15.bb | 70 ------------------- > 3 files changed, 145 deletions(-) > delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb > delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb > delete mode 100644 meta/recipes-kernel/linux/linux-yocto_5.15.bb > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb > deleted file mode 100644 > index 475fe34066d..00000000000 > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb > +++ /dev/null > @@ -1,45 +0,0 @@ > -KBRANCH ?= "v5.15/standard/preempt-rt/base" > - > -require recipes-kernel/linux/linux-yocto.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 ?= "8e0611e36c848a07f9cdd778903c9e51bb90b319" > -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" > - > -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-5.15;destsuffix=${KMETA};protocol=https" > - > -LINUX_VERSION ?= "5.15.108" > - > -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${SRCPV}" > - > -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 = "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", "", d)}" > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb > deleted file mode 100644 > index 365d01db781..00000000000 > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb > +++ /dev/null > @@ -1,30 +0,0 @@ > -KBRANCH ?= "v5.15/standard/tiny/base" > - > -LINUX_KERNEL_TYPE = "tiny" > -KCONFIG_MODE = "--allnoconfig" > - > -require recipes-kernel/linux/linux-yocto.inc > - > -LINUX_VERSION ?= "5.15.108" > -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 ?= "3d762b85647844790979dd1e17a762003aaa7476" > -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" > - > -PV = "${LINUX_VERSION}+git${SRCPV}" > - > -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-5.15;destsuffix=${KMETA};protocol=https" > - > -COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$" > - > -# Functionality flags > -KERNEL_FEATURES = "" > - > -KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb > deleted file mode 100644 > index 54c8e126449..00000000000 > --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb > +++ /dev/null > @@ -1,70 +0,0 @@ > -KBRANCH ?= "v5.15/standard/base" > - > -require recipes-kernel/linux/linux-yocto.inc > - > -# board specific branches > -KBRANCH:qemuarm ?= "v5.15/standard/arm-versatile-926ejs" > -KBRANCH:qemuarm64 ?= "v5.15/standard/qemuarm64" > -KBRANCH:qemumips ?= "v5.15/standard/mti-malta32" > -KBRANCH:qemuppc ?= "v5.15/standard/qemuppc" > -KBRANCH:qemuriscv64 ?= "v5.15/standard/base" > -KBRANCH:qemuriscv32 ?= "v5.15/standard/base" > -KBRANCH:qemux86 ?= "v5.15/standard/base" > -KBRANCH:qemux86-64 ?= "v5.15/standard/base" > -KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" > - > -SRCREV_machine:qemuarm ?= "80421c525a12141d31bf1592b0d8c176defe3010" > -SRCREV_machine:qemuarm64 ?= "9d140dbc3171bf272f51b524edeeb2f22783aca5" > -SRCREV_machine:qemumips ?= "b29a8fa62d88db512f1fa5d60e430a851d7e3aaf" > -SRCREV_machine:qemuppc ?= "7ee6b7fc4b57933114376cf012218c2ae3d23558" > -SRCREV_machine:qemuriscv64 ?= "e8c818cce43dd720c366d831aeb102c20c237652" > -SRCREV_machine:qemuriscv32 ?= "e8c818cce43dd720c366d831aeb102c20c237652" > -SRCREV_machine:qemux86 ?= "e8c818cce43dd720c366d831aeb102c20c237652" > -SRCREV_machine:qemux86-64 ?= "e8c818cce43dd720c366d831aeb102c20c237652" > -SRCREV_machine:qemumips64 ?= "5c900befc90365f6daa80989e8de0ccc546ff0f5" > -SRCREV_machine ?= "e8c818cce43dd720c366d831aeb102c20c237652" > -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" > - > -# 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 ?= "3299fb36854fdc288bddc2c4d265f8a2e5105944" > -PN:class-devupstream = "linux-yocto-upstream" > -KBRANCH:class-devupstream = "v5.15/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-5.15;destsuffix=${KMETA};protocol=https" > - > -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > -LINUX_VERSION ?= "5.15.108" > - > -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > -DEPENDS += "openssl-native util-linux-native" > -DEPENDS += "gmp-native libmpc-native" > - > -PV = "${LINUX_VERSION}+git${SRCPV}" > - > -KMETA = "kernel-meta" > -KCONF_BSP_AUDIT_LEVEL = "1" > - > -KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" > - > -COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32)$" > - > -# 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" > -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", "", d)}" > -KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.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" > - > -- > 2.39.2 >
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb deleted file mode 100644 index 475fe34066d..00000000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ /dev/null @@ -1,45 +0,0 @@ -KBRANCH ?= "v5.15/standard/preempt-rt/base" - -require recipes-kernel/linux/linux-yocto.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 ?= "8e0611e36c848a07f9cdd778903c9e51bb90b319" -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" - -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-5.15;destsuffix=${KMETA};protocol=https" - -LINUX_VERSION ?= "5.15.108" - -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${SRCPV}" - -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 = "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", "", d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb deleted file mode 100644 index 365d01db781..00000000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ /dev/null @@ -1,30 +0,0 @@ -KBRANCH ?= "v5.15/standard/tiny/base" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "5.15.108" -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 ?= "3d762b85647844790979dd1e17a762003aaa7476" -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -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-5.15;destsuffix=${KMETA};protocol=https" - -COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb deleted file mode 100644 index 54c8e126449..00000000000 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ /dev/null @@ -1,70 +0,0 @@ -KBRANCH ?= "v5.15/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH:qemuarm ?= "v5.15/standard/arm-versatile-926ejs" -KBRANCH:qemuarm64 ?= "v5.15/standard/qemuarm64" -KBRANCH:qemumips ?= "v5.15/standard/mti-malta32" -KBRANCH:qemuppc ?= "v5.15/standard/qemuppc" -KBRANCH:qemuriscv64 ?= "v5.15/standard/base" -KBRANCH:qemuriscv32 ?= "v5.15/standard/base" -KBRANCH:qemux86 ?= "v5.15/standard/base" -KBRANCH:qemux86-64 ?= "v5.15/standard/base" -KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" - -SRCREV_machine:qemuarm ?= "80421c525a12141d31bf1592b0d8c176defe3010" -SRCREV_machine:qemuarm64 ?= "9d140dbc3171bf272f51b524edeeb2f22783aca5" -SRCREV_machine:qemumips ?= "b29a8fa62d88db512f1fa5d60e430a851d7e3aaf" -SRCREV_machine:qemuppc ?= "7ee6b7fc4b57933114376cf012218c2ae3d23558" -SRCREV_machine:qemuriscv64 ?= "e8c818cce43dd720c366d831aeb102c20c237652" -SRCREV_machine:qemuriscv32 ?= "e8c818cce43dd720c366d831aeb102c20c237652" -SRCREV_machine:qemux86 ?= "e8c818cce43dd720c366d831aeb102c20c237652" -SRCREV_machine:qemux86-64 ?= "e8c818cce43dd720c366d831aeb102c20c237652" -SRCREV_machine:qemumips64 ?= "5c900befc90365f6daa80989e8de0ccc546ff0f5" -SRCREV_machine ?= "e8c818cce43dd720c366d831aeb102c20c237652" -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" - -# 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 ?= "3299fb36854fdc288bddc2c4d265f8a2e5105944" -PN:class-devupstream = "linux-yocto-upstream" -KBRANCH:class-devupstream = "v5.15/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-5.15;destsuffix=${KMETA};protocol=https" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.108" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" -DEPENDS += "gmp-native libmpc-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "1" - -KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" - -COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32)$" - -# 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" -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", "", d)}" -KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.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" -
5.15 doesn't work with gcc 13 and we'll be replacing 5.15 with a new kernel version later in the release cycle. Drop 5.15 now so we can move forward with gcc 13 and we'll add a new kernel version later. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- .../linux/linux-yocto-rt_5.15.bb | 45 ------------ .../linux/linux-yocto-tiny_5.15.bb | 30 -------- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 70 ------------------- 3 files changed, 145 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_5.15.bb