aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-07-25 11:10:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-12 17:16:59 +0100
commitbafaaad264fe3e745c714951ddcf2784d33b755a (patch)
treecb475094cdc455d46cf0148f0ddb7046c9407bd7
parent92aa6a587f4fabfadbebdb7ae24306d36f43910a (diff)
downloadopenembedded-core-contrib-bafaaad264fe3e745c714951ddcf2784d33b755a.tar.gz
Move meta-rt recipes to oe-core (meta)
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. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-rt/conf/layer.conf18
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb (renamed from meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb)0
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb (renamed from meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb)0
-rw-r--r--meta/recipes-rt/images/core-image-rt-sdk.bb (renamed from meta-rt/images/core-image-rt-sdk.bb)0
-rw-r--r--meta/recipes-rt/images/core-image-rt.bb (renamed from meta-rt/images/core-image-rt.bb)0
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests_0.73.bb (renamed from meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb)0
6 files changed, 0 insertions, 18 deletions
diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf
deleted file mode 100644
index 59f42b62fe9..00000000000
--- a/meta-rt/conf/layer.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Default to first disk/first partition
-RSP_ROOT ?= "sda1"
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
-
-# We have an images and various recipe-* directories, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/images/*.bb ${LAYERDIR}/images/*.bbappend \
- ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "rt"
-BBFILE_PATTERN_rt := "^${LAYERDIR}/"
-BBFILE_PRIORITY_rt = "8"
-
-# This layer builds images using a PREEMPT_RT kernel. Override any machine
-# specified kernel providers and leave it up to the kernel recipe to
-# determine COMPATIBLE_MACHINE.
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index 0ca53ae4361..0ca53ae4361 100644
--- a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index c8a175dad8a..c8a175dad8a 100644
--- a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
diff --git a/meta-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb
index 6e983433aaf..6e983433aaf 100644
--- a/meta-rt/images/core-image-rt-sdk.bb
+++ b/meta/recipes-rt/images/core-image-rt-sdk.bb
diff --git a/meta-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb
index e11f159f7aa..e11f159f7aa 100644
--- a/meta-rt/images/core-image-rt.bb
+++ b/meta/recipes-rt/images/core-image-rt.bb
diff --git a/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb b/meta/recipes-rt/rt-tests/rt-tests_0.73.bb
index 6334bcdeefe..6334bcdeefe 100644
--- a/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_0.73.bb