diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-08-20 22:58:18 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-23 12:06:51 +0100 |
| commit | 50265b486e2c37a080f1101264bffc5bfd108e79 (patch) | |
| tree | e490359b6c17f3c984483a5c47cff085a254d314 | |
| parent | 1a8c7cd0611607c6aac90f574b777dd51ae43f44 (diff) | |
| download | poky-50265b486e2c37a080f1101264bffc5bfd108e79.tar.gz | |
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 <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 36 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 23 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 42 |
3 files changed, 0 insertions, 101 deletions
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 @@ | |||
| 1 | KBRANCH ?= "standard/preempt-rt/base" | ||
| 2 | |||
| 3 | require recipes-kernel/linux/linux-yocto.inc | ||
| 4 | |||
| 5 | # Skip processing of this recipe if it is not explicitly specified as the | ||
| 6 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
| 7 | # to build multiple virtual/kernel providers, e.g. as dependency of | ||
| 8 | # core-image-rt-sdk, core-image-rt. | ||
| 9 | python () { | ||
| 10 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": | ||
| 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | ||
| 12 | } | ||
| 13 | |||
| 14 | SRCREV_machine ?= "091d8c17b1ba75344ed88a909ead563139de68b3" | ||
| 15 | SRCREV_meta ?= "660468df599bbd79a287a8a703d9ca066fd6a074" | ||
| 16 | |||
| 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | ||
| 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | ||
| 19 | |||
| 20 | LINUX_VERSION ?= "4.1.42" | ||
| 21 | |||
| 22 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
| 23 | |||
| 24 | KMETA = "kernel-meta" | ||
| 25 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
| 26 | |||
| 27 | LINUX_KERNEL_TYPE = "preempt-rt" | ||
| 28 | |||
| 29 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)" | ||
| 30 | |||
| 31 | # Functionality flags | ||
| 32 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" | ||
| 33 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
| 34 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" | ||
| 35 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | ||
| 36 | 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 @@ | |||
| 1 | KBRANCH ?= "standard/tiny/common-pc" | ||
| 2 | LINUX_KERNEL_TYPE = "tiny" | ||
| 3 | KCONFIG_MODE = "--allnoconfig" | ||
| 4 | |||
| 5 | require recipes-kernel/linux/linux-yocto.inc | ||
| 6 | |||
| 7 | LINUX_VERSION ?= "4.1.42" | ||
| 8 | |||
| 9 | KMETA = "kernel-meta" | ||
| 10 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
| 11 | |||
| 12 | SRCREV_machine ?= "f905fdd5da150ea809f847f00f3476220606c0ff" | ||
| 13 | SRCREV_meta ?= "660468df599bbd79a287a8a703d9ca066fd6a074" | ||
| 14 | |||
| 15 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
| 16 | |||
| 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | ||
| 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | ||
| 19 | |||
| 20 | COMPATIBLE_MACHINE = "(qemux86$)" | ||
| 21 | |||
| 22 | # Functionality flags | ||
| 23 | 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 @@ | |||
| 1 | KBRANCH ?= "standard/base" | ||
| 2 | |||
| 3 | require recipes-kernel/linux/linux-yocto.inc | ||
| 4 | |||
| 5 | # board specific branches | ||
| 6 | KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" | ||
| 7 | KBRANCH_qemuarm64 ?= "standard/qemuarm64" | ||
| 8 | KBRANCH_qemumips ?= "standard/mti-malta32" | ||
| 9 | KBRANCH_qemuppc ?= "standard/qemuppc" | ||
| 10 | KBRANCH_qemux86 ?= "standard/base" | ||
| 11 | KBRANCH_qemux86-64 ?= "standard/base" | ||
| 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | ||
| 13 | |||
| 14 | SRCREV_machine_qemuarm ?= "b7334672abf08f9dc9e277969e9266785580fa80" | ||
| 15 | SRCREV_machine_qemuarm64 ?= "f905fdd5da150ea809f847f00f3476220606c0ff" | ||
| 16 | SRCREV_machine_qemumips ?= "664fb3764bc804bfc9fd8ff582b374299e1fc016" | ||
| 17 | SRCREV_machine_qemuppc ?= "7392e713c9eb1c67e9e6f8f2d14cae44467c1fbe" | ||
| 18 | SRCREV_machine_qemux86 ?= "f905fdd5da150ea809f847f00f3476220606c0ff" | ||
| 19 | SRCREV_machine_qemux86-64 ?= "f905fdd5da150ea809f847f00f3476220606c0ff" | ||
| 20 | SRCREV_machine_qemumips64 ?= "85e973a2366e2a42d5082f5cd57852f8086502f4" | ||
| 21 | SRCREV_machine ?= "f905fdd5da150ea809f847f00f3476220606c0ff" | ||
| 22 | SRCREV_meta ?= "660468df599bbd79a287a8a703d9ca066fd6a074" | ||
| 23 | |||
| 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | ||
| 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | ||
| 26 | |||
| 27 | LINUX_VERSION ?= "4.1.42" | ||
| 28 | |||
| 29 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
| 30 | |||
| 31 | KMETA = "kernel-meta" | ||
| 32 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
| 33 | |||
| 34 | COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" | ||
| 35 | |||
| 36 | # Functionality flags | ||
| 37 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" | ||
| 38 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
| 39 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" | ||
| 40 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | ||
| 41 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | ||
| 42 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | ||
