diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-03-04 09:55:24 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-06 08:19:18 +0000 |
commit | 8efa405ee0ab9ae0e674fe8bc9551f4367b4c269 (patch) | |
tree | ef09c16e0248e1b3c9aa9a2cd6dedc01cc4f9365 /meta | |
parent | 5d8866cbf0fc059f0ec19c2756a0b2d7c126d408 (diff) | |
download | poky-8efa405ee0ab9ae0e674fe8bc9551f4367b4c269.tar.gz |
linux-yocto: drop 5.2 recipes
linux-yocto 5.4 will serve as the versioned reference kernel in
the upcoming release, and -dev will serve as the "newer" kernel.
As such, we drop v5.2 from master, but will continue to update
and support it in released branches.
(From OE-Core rev: e71cda699189d3762d8af88d3ccdc0b0430b973c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 44 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 32 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.2.bb | 54 |
3 files changed, 0 insertions, 130 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb deleted file mode 100644 index a23a5e6f93..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | KBRANCH ?= "v5.2/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("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 | |||
14 | SRCREV_machine ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" | ||
15 | SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" | ||
16 | |||
17 | SRC_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-5.2;destsuffix=${KMETA}" | ||
19 | |||
20 | LINUX_VERSION ?= "5.2.32" | ||
21 | |||
22 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
23 | |||
24 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | ||
25 | DEPENDS += "openssl-native util-linux-native" | ||
26 | |||
27 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
28 | |||
29 | KMETA = "kernel-meta" | ||
30 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
31 | |||
32 | LINUX_KERNEL_TYPE = "preempt-rt" | ||
33 | |||
34 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" | ||
35 | |||
36 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | ||
37 | |||
38 | # Functionality flags | ||
39 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" | ||
40 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
41 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | ||
42 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | ||
43 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | ||
44 | KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb deleted file mode 100644 index ac9904f415..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | KBRANCH ?= "v5.2/standard/tiny/base" | ||
2 | KBRANCH_qemuarm ?= "v5.2/standard/tiny/arm-versatile-926ejs" | ||
3 | |||
4 | LINUX_KERNEL_TYPE = "tiny" | ||
5 | KCONFIG_MODE = "--allnoconfig" | ||
6 | |||
7 | require recipes-kernel/linux/linux-yocto.inc | ||
8 | |||
9 | LINUX_VERSION ?= "5.2.32" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
11 | |||
12 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | ||
13 | DEPENDS += "openssl-native util-linux-native" | ||
14 | |||
15 | KMETA = "kernel-meta" | ||
16 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
17 | |||
18 | SRCREV_machine_qemuarm ?= "e0a3a01b24070b15121e938ea19755091bf0d662" | ||
19 | SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" | ||
20 | SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" | ||
21 | |||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
23 | |||
24 | SRC_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-5.2;destsuffix=${KMETA}" | ||
26 | |||
27 | COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" | ||
28 | |||
29 | # Functionality flags | ||
30 | KERNEL_FEATURES = "" | ||
31 | |||
32 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb deleted file mode 100644 index eab142e1c6..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | KBRANCH ?= "v5.2/standard/base" | ||
2 | |||
3 | require recipes-kernel/linux/linux-yocto.inc | ||
4 | |||
5 | # board specific branches | ||
6 | KBRANCH_qemuarm ?= "v5.2/standard/arm-versatile-926ejs" | ||
7 | KBRANCH_qemuarm64 ?= "v5.2/standard/qemuarm64" | ||
8 | KBRANCH_qemumips ?= "v5.2/standard/mti-malta32" | ||
9 | KBRANCH_qemuppc ?= "v5.2/standard/qemuppc" | ||
10 | KBRANCH_qemuriscv64 ?= "v5.2/standard/base" | ||
11 | KBRANCH_qemux86 ?= "v5.2/standard/base" | ||
12 | KBRANCH_qemux86-64 ?= "v5.2/standard/base" | ||
13 | KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" | ||
14 | |||
15 | SRCREV_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" | ||
16 | SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" | ||
17 | SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" | ||
18 | SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" | ||
19 | SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" | ||
20 | SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" | ||
21 | SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" | ||
22 | SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" | ||
23 | SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" | ||
24 | SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" | ||
25 | |||
26 | # remap qemuarm to qemuarma15 for the 5.2 kernel | ||
27 | # KMACHINE_qemuarm ?= "qemuarma15" | ||
28 | |||
29 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | ||
30 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" | ||
31 | |||
32 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
33 | LINUX_VERSION ?= "5.2.32" | ||
34 | |||
35 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | ||
36 | DEPENDS += "openssl-native util-linux-native" | ||
37 | |||
38 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
39 | |||
40 | KMETA = "kernel-meta" | ||
41 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
42 | |||
43 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | ||
44 | |||
45 | COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" | ||
46 | |||
47 | # Functionality flags | ||
48 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" | ||
49 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
50 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | ||
51 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | ||
52 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | ||
53 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | ||
54 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" | ||