summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-08-30 09:45:43 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-04 11:03:55 +0100
commit2a498c6f3da6a4d98b786a8c2247bc5b5d6e6b9f (patch)
tree39f282a59e530a02b2699323faa6ad67533781a8
parent52575da23ba70c9aee82a695e2145b891340f2ef (diff)
downloadpoky-2a498c6f3da6a4d98b786a8c2247bc5b5d6e6b9f.tar.gz
linux-yocto/4.12: drop versioned recipes
While the 4.12 kernel will continue to get updates, that will happen in maintenance branches. So we drop the 4.12 versioned recipes to make it clear that 4.14 and 4.18 are the active kernels. (From OE-Core rev: a528cf2a783b940f44d52cae4ec8c20c5763e624) 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.12.bb38
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb25
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.12.bb46
3 files changed, 0 insertions, 109 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
deleted file mode 100644
index a6a8b60e1b..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
+++ /dev/null
@@ -1,38 +0,0 @@
1KBRANCH ?= "standard/preempt-rt/base"
2
3require 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.
9python () {
10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12}
13
14SRCREV_machine ?= "ef88c3326f62cec4b98340324ddbe7f7f7704fd5"
15SRCREV_meta ?= "2ae65226f64ed5c888d60eef76b6249db678d060"
16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
19
20LINUX_VERSION ?= "4.12.28"
21
22PV = "${LINUX_VERSION}+git${SRCPV}"
23
24KMETA = "kernel-meta"
25KCONF_BSP_AUDIT_LEVEL = "2"
26
27LINUX_KERNEL_TYPE = "preempt-rt"
28
29COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)"
30
31KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
32
33# Functionality flags
34KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
35KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
36KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
37KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
38KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
deleted file mode 100644
index cb4ef3a659..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1KBRANCH ?= "standard/tiny/common-pc"
2LINUX_KERNEL_TYPE = "tiny"
3KCONFIG_MODE = "--allnoconfig"
4
5require recipes-kernel/linux/linux-yocto.inc
6
7LINUX_VERSION ?= "4.12.28"
8
9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2"
11
12SRCREV_machine ?= "e562267bae5b518acca880c929fbbdf6be047e0a"
13SRCREV_meta ?= "2ae65226f64ed5c888d60eef76b6249db678d060"
14
15PV = "${LINUX_VERSION}+git${SRCPV}"
16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
19
20COMPATIBLE_MACHINE = "qemux86|qemux86-64"
21
22# Functionality flags
23KERNEL_FEATURES = ""
24
25KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
deleted file mode 100644
index 0aea05b83f..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb
+++ /dev/null
@@ -1,46 +0,0 @@
1KBRANCH ?= "standard/base"
2
3require recipes-kernel/linux/linux-yocto.inc
4
5# board specific branches
6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "standard/qemuarm64"
8KBRANCH_qemumips ?= "standard/mti-malta32"
9KBRANCH_qemuppc ?= "standard/qemuppc"
10KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13
14SRCREV_machine_qemuarm ?= "b84ecefc243a6ed67d8b6020394963de1240a9f0"
15SRCREV_machine_qemuarm64 ?= "e562267bae5b518acca880c929fbbdf6be047e0a"
16SRCREV_machine_qemumips ?= "15b1ab68f73fa60dd95a74c640e87e05fad1716d"
17SRCREV_machine_qemuppc ?= "e562267bae5b518acca880c929fbbdf6be047e0a"
18SRCREV_machine_qemux86 ?= "e562267bae5b518acca880c929fbbdf6be047e0a"
19SRCREV_machine_qemux86-64 ?= "e562267bae5b518acca880c929fbbdf6be047e0a"
20SRCREV_machine_qemumips64 ?= "57a3f72a020fc84f2da5b0b4c5de4cdbc22b3284"
21SRCREV_machine ?= "e562267bae5b518acca880c929fbbdf6be047e0a"
22SRCREV_meta ?= "2ae65226f64ed5c888d60eef76b6249db678d060"
23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
26
27DEPENDS += "openssl-native util-linux-native"
28
29LINUX_VERSION ?= "4.12.28"
30
31PV = "${LINUX_VERSION}+git${SRCPV}"
32
33KMETA = "kernel-meta"
34KCONF_BSP_AUDIT_LEVEL = "2"
35
36KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
37
38COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
39
40# Functionality flags
41KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
42KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
43KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
44KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
45KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
46KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"