mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

Move meta-rt recipes to oe-core (meta)

Browse Source 
Keeping the rt recipes in their own layer has led to maintenance issues,
particularly with the linux-yocto-rt recipes. As these kernel types are part of
the same linux-yocto source repository, it seems reasonable to include the rt
kernel recipes alongside the standard recipes. A new recipes-rt directory for
the other recipes provides adequate separation and eliminates the need for a
separate layer.

As there is no meta-rt/conf/layer.conf to force the kernel, users must now
specify the rt kernel in their local.conf or in the machine.conf:

PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"

The merging of the rt recipes into the core also eliminates complications with
multiple layer dependencies for new BSP layers. Having to either separate RT
BSPs from standard BSPs or force users to add meta-rt to bblayers even when not
building an RT BSP (because the RT BSPs in the same layer would fail to parse
without it) was sub-optimal at best.

(From OE-Core rev: bafaaad264fe3e745c714951ddcf2784d33b755a)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Darren Hart
2011-07-25 11:10:17 -07:00
committed by Richard Purdie
parent d9bf0a05c2
commit 15c2a7035d
6 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+44
View File
@@ -0,0 +1,44 @@
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 = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
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), "_", "-")
bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d)
}
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 recipes-kernel/linux/linux-tools.inc
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+46
View File
@@ -0,0 +1,46 @@
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
KMACHINE = "common-pc"
KMACHINE_qemux86 = "common-pc"
KMACHINE_qemux86-64 = "common-pc-64"
KMACHINE_qemuarm = "arm-versatile-926ejs"
KMACHINE_qemuppc = "qemu-ppc32"
KMACHINE_qemumips = "mti-malta32-be"
KBRANCH = "yocto/standard/preempt-rt/base"
KMETA = meta
LINUX_VERSION ?= "3.0"
LINUX_KERNEL_TYPE = "preempt-rt"
LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
SRCREV_machine = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
PR = "r0"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
# Omit broken machines from COMPATIBLE_MACHINE
# qemuppc hangs at boot
# qemumips panics at boot
COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
# Functionality flags
KERNEL_REVISION_CHECKING ?= "t"
KERNEL_FEATURES=features/netfilter
KERNEL_FEATURES_append=" features/taskstats"
KERNEL_FEATURES_append_qemux86=" cfg/sound"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
YOCTO_KERNEL_META_DATA=t
# extra tasks
addtask kernel_link_vmlinux after do_compile before do_install
addtask validate_branches before do_patch after do_kernel_checkout
addtask kernel_configcheck after do_configure before do_compile
require recipes-kernel/linux/linux-tools.inc