From 50265b486e2c37a080f1101264bffc5bfd108e79 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 20 Aug 2017 22:58:18 -0400 Subject: linux-yocto: remove 4.1 recipes We have 4.4 and 4.9 as LTS kernels, the 4.1 variants are no longer needed and are dropped. (From OE-Core rev: 1a25cea311cbebb2af0c1a0b964208281e6026de) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 36 ------------------- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 23 ------------- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 42 ----------------------- 3 files changed, 101 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_4.1.bb diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb deleted file mode 100644 index f984f7a93d..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ /dev/null @@ -1,36 +0,0 @@ -KBRANCH ?= "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("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "091d8c17b1ba75344ed88a909ead563139de68b3" -SRCREV_meta ?= "660468df599bbd79a287a8a703d9ca066fd6a074" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.1.42" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)" - -# 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" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb deleted file mode 100644 index 7f934b50ac..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -KBRANCH ?= "standard/tiny/common-pc" -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "4.1.42" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine ?= "f905fdd5da150ea809f847f00f3476220606c0ff" -SRCREV_meta ?= "660468df599bbd79a287a8a703d9ca066fd6a074" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "(qemux86$)" - -# Functionality flags -KERNEL_FEATURES = "" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb deleted file mode 100644 index ae0eb85888..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -KBRANCH ?= "standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "standard/qemuarm64" -KBRANCH_qemumips ?= "standard/mti-malta32" -KBRANCH_qemuppc ?= "standard/qemuppc" -KBRANCH_qemux86 ?= "standard/base" -KBRANCH_qemux86-64 ?= "standard/base" -KBRANCH_qemumips64 ?= "standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "b7334672abf08f9dc9e277969e9266785580fa80" -SRCREV_machine_qemuarm64 ?= "f905fdd5da150ea809f847f00f3476220606c0ff" -SRCREV_machine_qemumips ?= "664fb3764bc804bfc9fd8ff582b374299e1fc016" -SRCREV_machine_qemuppc ?= "7392e713c9eb1c67e9e6f8f2d14cae44467c1fbe" -SRCREV_machine_qemux86 ?= "f905fdd5da150ea809f847f00f3476220606c0ff" -SRCREV_machine_qemux86-64 ?= "f905fdd5da150ea809f847f00f3476220606c0ff" -SRCREV_machine_qemumips64 ?= "85e973a2366e2a42d5082f5cd57852f8086502f4" -SRCREV_machine ?= "f905fdd5da150ea809f847f00f3476220606c0ff" -SRCREV_meta ?= "660468df599bbd79a287a8a703d9ca066fd6a074" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.1.42" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.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)}" -- cgit v1.2.3-54-g00ecf