summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-04-09 11:37:57 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-10 13:46:17 +0100
commit7c915df65f078204d3321420c1f13314794fe2df (patch)
tree6e0e40a4ec731fc94410e87ea0eba3fea13a6c43
parent61edee0d29b3b6a77cd51dfcc064e90a8e471eb7 (diff)
downloadpoky-7c915df65f078204d3321420c1f13314794fe2df.tar.gz
linux-yocto/4.18: remove versioned recipes
The 4.18 kernel has been replaced by 4.19 and 5.0 in master. poky-tiny has been tested against 5.0, so we can now remove the 4.18 recipes. The 4.18 branches will continue to be maintained, but we only want two active kernels in the master/releases branches. (From OE-Core rev: 9251cec30ff77b526363bed7299238e33b68feb4) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb43
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb32
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.18.bb48
3 files changed, 0 insertions, 123 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
deleted file mode 100644
index 91bb5765d1..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
+++ /dev/null
@@ -1,43 +0,0 @@
1KBRANCH ?= "v4.18/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 ?= "60b23779def52cac86267bdef0da0f2750dce287"
15SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c"
16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"
19
20LINUX_VERSION ?= "4.18.33"
21
22LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
23
24DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
25DEPENDS += "openssl-native util-linux-native"
26
27PV = "${LINUX_VERSION}+git${SRCPV}"
28
29KMETA = "kernel-meta"
30KCONF_BSP_AUDIT_LEVEL = "2"
31
32LINUX_KERNEL_TYPE = "preempt-rt"
33
34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarm64|qemuppc|qemumips)"
35
36KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
37
38# Functionality flags
39KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
40KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
41KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
42KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
43KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
deleted file mode 100644
index c986eb8bac..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1KBRANCH ?= "v4.18/standard/tiny/base"
2KBRANCH_qemuarm ?= "v4.18/standard/tiny/arm-versatile-926ejs"
3
4LINUX_KERNEL_TYPE = "tiny"
5KCONFIG_MODE = "--allnoconfig"
6
7require recipes-kernel/linux/linux-yocto.inc
8
9LINUX_VERSION ?= "4.18.33"
10LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
11
12DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
13DEPENDS += "openssl-native util-linux-native"
14
15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2"
17
18SRCREV_machine_qemuarm ?= "bc69d96021b7407a636cb7bc56334bf95a525e76"
19SRCREV_machine ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d"
20SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c"
21
22PV = "${LINUX_VERSION}+git${SRCPV}"
23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"
26
27COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm"
28
29# Functionality flags
30KERNEL_FEATURES = ""
31
32KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
deleted file mode 100644
index 3be72a3a57..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb
+++ /dev/null
@@ -1,48 +0,0 @@
1KBRANCH ?= "v4.18/standard/base"
2
3require recipes-kernel/linux/linux-yocto.inc
4
5# board specific branches
6KBRANCH_qemuarm ?= "v4.18/standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "v4.18/standard/qemuarm64"
8KBRANCH_qemumips ?= "v4.18/standard/mti-malta32"
9KBRANCH_qemuppc ?= "v4.18/standard/qemuppc"
10KBRANCH_qemux86 ?= "v4.18/standard/base"
11KBRANCH_qemux86-64 ?= "v4.18/standard/base"
12KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64"
13
14SRCREV_machine_qemuarm ?= "813d81df5defc4e552b7c3085673437eaba4eea7"
15SRCREV_machine_qemuarm64 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d"
16SRCREV_machine_qemumips ?= "12620f16df220007dfda3b70cc5044ec2322142c"
17SRCREV_machine_qemuppc ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d"
18SRCREV_machine_qemux86 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d"
19SRCREV_machine_qemux86-64 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d"
20SRCREV_machine_qemumips64 ?= "104cdfbbf95981e31a32dfe3bdeaff3afb517ad4"
21SRCREV_machine ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d"
22SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c"
23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"
26
27LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
28LINUX_VERSION ?= "4.18.33"
29
30DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
31DEPENDS += "openssl-native util-linux-native"
32
33PV = "${LINUX_VERSION}+git${SRCPV}"
34
35KMETA = "kernel-meta"
36KCONF_BSP_AUDIT_LEVEL = "2"
37
38KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
39
40COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
41
42# Functionality flags
43KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
44KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
45KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
46KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
47KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
48KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 03:04:57 +0000