From 70e26e6995b9b73c26365250dfa678994d336c68 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 20 Nov 2011 00:30:02 -0500 Subject: linux-yocto: remove 2.6.34 recipes To limit the number of active recipes in master to 3 (v2.6.37, v3.0 and -dev), the 2.6.34 recipe can now be removed. It is available in the previous release branches and will continue to work, but won't be updated as part of ongoing dev efforts. (From OE-Core rev: bd5f38b0bb063b2fb2e46abc5d7ffaed4b6b502c) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 38 ----------------- meta/recipes-kernel/linux/linux-yocto_2.6.34.bb | 49 ---------------------- 2 files changed, 87 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_2.6.34.bb diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb deleted file mode 100644 index 26423255c7..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb +++ /dev/null @@ -1,38 +0,0 @@ -inherit kernel -require recipes-kernel/linux/linux-yocto.inc - -KMACHINE = "common-pc" -KMACHINE_qemux86 = "common_pc" -KMACHINE_qemux86-64 = "common_pc_64" - -LINUX_VERSION ?= "2.6.34" -LINUX_KERNEL_TYPE = "preempt_rt" -LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" - -KMETA = wrs_meta -KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE} - -SRCREV_machine_qemux86 = "439602eb6acd53d9beb8493710310214fc7bd749" -SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e" -SRCREV_machine = "439602eb6acd53d9beb8493710310214fc7bd749" -SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b" - -PR = "r3" -PV = "${LINUX_VERSION}+git${SRCPV}" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -# this performs a fixup on the SRCREV for new/undefined BSPs -python __anonymous () { - import bb, re, string - - kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") - d.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype) -} - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta" - -# Functionality flags -KERNEL_FEATURES=features/netfilter - -require recipes-kernel/linux/linux-tools.inc diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb deleted file mode 100644 index cbcfa56fec..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb +++ /dev/null @@ -1,49 +0,0 @@ -inherit kernel -require linux-yocto.inc - -KMACHINE = "common_pc" -KMACHINE_qemux86 = "common_pc" -KMACHINE_qemux86-64 = "common_pc_64" -KMACHINE_qemuppc = "qemu_ppc32" -KMACHINE_qemumips = "mti_malta32_be" -KMACHINE_qemuarm = "arm_versatile_926ejs" - -LINUX_VERSION ?= "2.6.34" -LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" - -KMETA = wrs_meta -KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE_EXTENSION} - -SRCREV_machine_qemuarm = "a2fb081b44d6368eff8d28e2fdb991c61b1f428e" -SRCREV_machine_qemumips = "c32d40f960e3c89d07f079bec4c96dcbfc749f0b" -SRCREV_machine_qemuppc = "96d6bc31d3caaf62a966255479cc5cee0e76b1e9" -SRCREV_machine_qemux86 = "72ca49ab08b8eb475cec82a10049503602325791" -SRCREV_machine_qemux86-64 = "72ca49ab08b8eb475cec82a10049503602325791" -SRCREV_machine = "72ca49ab08b8eb475cec82a10049503602325791" -SRCREV_meta = "ec26387cb168e9e0976999b528b5a9dd62e3157a" - -PR = "r2" -PV = "${LINUX_VERSION}+git${SRCPV}" -SRCREV_FORMAT = "meta_machine" - -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" - -# this performs a fixup on historical kernel types with embedded _'s -python __anonymous () { - import bb, re, string - - kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") - d.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype) -} - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta" - -# Functionality flags -KERNEL_REVISION_CHECKING ?= "t" -KERNEL_FEATURES=features/netfilter - -# extra tasks -addtask kernel_link_vmlinux after do_compile before do_install -addtask validate_branches before do_patch after do_kernel_checkout - -require linux-tools.inc -- cgit v1.2.3-54-g00ecf