[OE-core] [PATCH 4/4] linux-yocto: drop 4.4 recipes

Saul Wold sgw at linux.intel.com
Tue Feb 28 21:25:09 UTC 2017


On Sun, 2017-02-26 at 22:10 -0500, Bruce Ashfield wrote:
> We have 4.1 (LTSI) 4.9 (LTS) and 4.10 as the three kernels in the
> master branch. 4.4 is no longer needed and can be dropped.
> 
Regarding 4.4, this is not exactly true, not everyone has migrated to
the 4.9 LTS as it is still fairly "new" as far as kernel goes, so let's
please preserve 4.4 for one more release.

meta-intel needs to support 4.4 and 4.9 currently.

Sau!

> This kernel will continue to get -stable updates as appropriate, but
> won't get SRCREV updates to the master branch.
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
> ---
>  meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   | 36 -----------
> --------
>  meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 23 -------------
>  meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 42 -----------
> ------------
>  3 files changed, 101 deletions(-)
>  delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
>  delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
>  delete mode 100644 meta/recipes-kernel/linux/linux-yocto_4.4.bb
> 
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
> b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
> deleted file mode 100644
> index 82f1a94f162f..000000000000
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -KBRANCH ?= "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("PREFERRED_PROVIDER_virtual/kernel") != "linux-
> yocto-rt":
> -        raise bb.parse.SkipPackage("Set
> PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
> -}
> -
> -SRCREV_machine ?= "6622c6471016005d5588aa4338ce57aced713dcd"
> -SRCREV_meta ?= "f4a781388fae67caec79a5a571c8aadef0185044"
> -
> -SRC_URI = "git://git.yoctoproject.org/linux-yocto-
> 4.4.git;branch=${KBRANCH};name=machine \
> -           git://git.yoctoproject.org/yocto-kernel-
> cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
> -
> -LINUX_VERSION ?= "4.4.41"
> -
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -
> -KMETA = "kernel-meta"
> -KCONF_BSP_AUDIT_LEVEL = "2"
> -
> -LINUX_KERNEL_TYPE = "preempt-rt"
> -
> -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)"
> -
> -# 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"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
> b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
> deleted file mode 100644
> index 6cb580dc3e90..000000000000
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -KBRANCH ?= "standard/tiny/common-pc"
> -LINUX_KERNEL_TYPE = "tiny"
> -KCONFIG_MODE = "--allnoconfig"
> -
> -require recipes-kernel/linux/linux-yocto.inc
> -
> -LINUX_VERSION ?= "4.4.41"
> -
> -KMETA = "kernel-meta"
> -KCONF_BSP_AUDIT_LEVEL = "2"
> -
> -SRCREV_machine ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
> -SRCREV_meta ?= "f4a781388fae67caec79a5a571c8aadef0185044"
> -
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -
> -SRC_URI = "git://git.yoctoproject.org/linux-yocto-
> 4.4.git;branch=${KBRANCH};name=machine \
> -           git://git.yoctoproject.org/yocto-kernel-
> cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
> -
> -COMPATIBLE_MACHINE = "(qemux86$)"
> -
> -# Functionality flags
> -KERNEL_FEATURES = ""
> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
> b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
> deleted file mode 100644
> index 34e0f38c030b..000000000000
> --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -KBRANCH ?= "standard/base"
> -
> -require recipes-kernel/linux/linux-yocto.inc
> -
> -# board specific branches
> -KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
> -KBRANCH_qemuarm64 ?= "standard/qemuarm64"
> -KBRANCH_qemumips ?= "standard/mti-malta32"
> -KBRANCH_qemuppc  ?= "standard/qemuppc"
> -KBRANCH_qemux86  ?= "standard/base"
> -KBRANCH_qemux86-64 ?= "standard/base"
> -KBRANCH_qemumips64 ?= "standard/mti-malta64"
> -
> -SRCREV_machine_qemuarm ?= "60287c1951ca7063bc19597eb5cabf834e660cfb"
> -SRCREV_machine_qemuarm64 ?=
> "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
> -SRCREV_machine_qemumips ?=
> "143d659ae6d53623001e22c13a0286bd6d1723ca"
> -SRCREV_machine_qemuppc ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
> -SRCREV_machine_qemux86 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
> -SRCREV_machine_qemux86-64 ?=
> "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
> -SRCREV_machine_qemumips64 ?=
> "c74cc42106745bab08de6263b9320ac029f2cca9"
> -SRCREV_machine ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
> -SRCREV_meta ?= "f4a781388fae67caec79a5a571c8aadef0185044"
> -
> -SRC_URI = "git://git.yoctoproject.org/linux-yocto-
> 4.4.git;name=machine;branch=${KBRANCH}; \
> -           git://git.yoctoproject.org/yocto-kernel-
> cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
> -
> -LINUX_VERSION ?= "4.4.41"
> -
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -
> -KMETA = "kernel-meta"
> -KCONF_BSP_AUDIT_LEVEL = "2"
> -
> -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)}"
> -- 
> 2.5.0
> 



More information about the Openembedded-core mailing list