From: Bruce Ashfield Date: Tue, 9 Apr 2019 15:37:57 +0000 (-0400) Subject: linux-yocto/4.18: remove versioned recipes X-Git-Tag: 2019-04~55 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9251cec30ff77b526363bed7299238e33b68feb4;p=openembedded-core.git 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. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- 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 @@ -KBRANCH ?= "v4.18/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("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "60b23779def52cac86267bdef0da0f2750dce287" -SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.18.33" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarm64|qemuppc|qemumips)" - -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" - -# 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 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 @@ -KBRANCH ?= "v4.18/standard/tiny/base" -KBRANCH_qemuarm ?= "v4.18/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "4.18.33" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine_qemuarm ?= "bc69d96021b7407a636cb7bc56334bf95a525e76" -SRCREV_machine ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_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 @@ -KBRANCH ?= "v4.18/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v4.18/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v4.18/standard/qemuarm64" -KBRANCH_qemumips ?= "v4.18/standard/mti-malta32" -KBRANCH_qemuppc ?= "v4.18/standard/qemuppc" -KBRANCH_qemux86 ?= "v4.18/standard/base" -KBRANCH_qemux86-64 ?= "v4.18/standard/base" -KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "813d81df5defc4e552b7c3085673437eaba4eea7" -SRCREV_machine_qemuarm64 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemumips ?= "12620f16df220007dfda3b70cc5044ec2322142c" -SRCREV_machine_qemuppc ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemux86 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemux86-64 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemumips64 ?= "104cdfbbf95981e31a32dfe3bdeaff3afb517ad4" -SRCREV_machine ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.18.33" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" - -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)}"