* [PATCH 01/10] meta-rt: refresh linux-yocto-rt recipe
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 02/10] meta-rt: rt-tests v0.73 instead of AUTOREV Darren Hart
` (9 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
Rename the recipe to match the linux-yocto recipe renames using the kernel
version in the PV portion of the filename.
Add the SRCREVs to the recipe as was done with the core linux-yocto recipes.
Add qemux86 as it is also present in the linux-yocto-2.6.34.git repository.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-rt/conf/layer.conf | 6 ------
...to-rt_stablegit.bb => linux-yocto-rt_2.6.34.bb} | 12 +++++++++---
2 files changed, 9 insertions(+), 9 deletions(-)
rename meta-rt/recipes-kernel/{linux-yocto-rt_stablegit.bb => linux-yocto-rt_2.6.34.bb} (65%)
diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf
index 94ebc02..f105405 100644
--- a/meta-rt/conf/layer.conf
+++ b/meta-rt/conf/layer.conf
@@ -15,9 +15,3 @@ BBFILE_PRIORITY_rt = "8"
# specified kernel providers and leave it up to the kernel recipe to
# determine COMPATIBLE_MACHINE.
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
-
-# preempt_rt SRCREVs, one for meta, one per machine
-SRCREV_meta_pn-linux-yocto-rt ?= "b0615811ce38836d1ade230e3bdb1efaaa68471f"
-SRCREV_machine_pn-linux-yocto-rt_qemux86-64 ?= "f49444f06875894389e640bcda6c3f6ceb1f0c3e"
-SRCREV_machine_pn-linux-yocto-rt_atom-pc ?= "78dacaf8222c9492ba17f652989ef3466423bdc2"
-
diff --git a/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb b/meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
similarity index 65%
rename from meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb
rename to meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
index cba1321..01a6761 100644
--- a/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb
+++ b/meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
@@ -1,6 +1,7 @@
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
+KMACHINE_qemux86 = "common_pc"
KMACHINE_qemux86-64 = "common_pc_64"
KMACHINE_atom-pc = "atom-pc"
@@ -11,11 +12,16 @@ LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}"
KMETA = wrs_meta
KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE}
-PR = "r1"
+SRCREV_machine_qemux86 = "439602eb6acd53d9beb8493710310214fc7bd749"
+SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
+SRCREV_machine_atom-pc = "269d71029adcf4d1dbf8441f091d824478d8c87d"
+SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
+
+PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
-COMPATIBLE_MACHINE = "(qemux86-64|atom-pc)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|atom-pc)"
# this performs a fixup on the SRCREV for new/undefined BSPs
python __anonymous () {
@@ -25,7 +31,7 @@ python __anonymous () {
bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d)
}
-SRC_URI = "git://git.yoctoproject.org/linux-2.6-windriver.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
+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"
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 02/10] meta-rt: rt-tests v0.73 instead of AUTOREV
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
2011-08-11 23:08 ` [PATCH 01/10] meta-rt: refresh linux-yocto-rt recipe Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 03/10] meta-rt: canonicalize directory structure Darren Hart
` (8 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
AUTOREV is handy is a development aid, but it really shouldn't be used as a
default as it breaks the consistency and repeatability of a build. It also
causes additional fetches which may not be desired or expected.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../{rt-tests_git.bb => rt-tests_0.73.bb} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename meta-rt/recipes-tests/{rt-tests_git.bb => rt-tests_0.73.bb} (97%)
diff --git a/meta-rt/recipes-tests/rt-tests_git.bb b/meta-rt/recipes-tests/rt-tests_0.73.bb
similarity index 97%
rename from meta-rt/recipes-tests/rt-tests_git.bb
rename to meta-rt/recipes-tests/rt-tests_0.73.bb
index 35af022..6334bcd 100644
--- a/meta-rt/recipes-tests/rt-tests_git.bb
+++ b/meta-rt/recipes-tests/rt-tests_0.73.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=ce162fe491d19d2ec67dff6dbc938d50 \
file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
-SRCREV = ${AUTOREV}
+SRCREV = v0.73
PV = "git${SRCPV}"
PR = "r0"
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 03/10] meta-rt: canonicalize directory structure
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
2011-08-11 23:08 ` [PATCH 01/10] meta-rt: refresh linux-yocto-rt recipe Darren Hart
2011-08-11 23:08 ` [PATCH 02/10] meta-rt: rt-tests v0.73 instead of AUTOREV Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe Darren Hart
` (7 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
Use the more standard recipes-*/*/*.bb layout.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-rt/conf/layer.conf | 5 +++--
.../{ => linux}/linux-yocto-rt_2.6.34.bb | 0
.../recipes-tests/{ => rt-tests}/rt-tests_0.73.bb | 0
3 files changed, 3 insertions(+), 2 deletions(-)
rename meta-rt/recipes-kernel/{ => linux}/linux-yocto-rt_2.6.34.bb (100%)
rename meta-rt/recipes-tests/{ => rt-tests}/rt-tests_0.73.bb (100%)
diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf
index f105405..59f42b6 100644
--- a/meta-rt/conf/layer.conf
+++ b/meta-rt/conf/layer.conf
@@ -5,8 +5,9 @@ RSP_ROOT ?= "sda1"
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"
-
+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"
diff --git a/meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
similarity index 100%
rename from meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
rename to meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
diff --git a/meta-rt/recipes-tests/rt-tests_0.73.bb b/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb
similarity index 100%
rename from meta-rt/recipes-tests/rt-tests_0.73.bb
rename to meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (2 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 03/10] meta-rt: canonicalize directory structure Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-12 0:40 ` Bruce Ashfield
2011-08-11 23:08 ` [PATCH 05/10] meta-rt: remove atom-pc support from the main layer Darren Hart
` (6 subsequent siblings)
10 siblings, 1 reply; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
Add the initial linux-yocto-rt_3.0 recipe.
TODO: replace the AUTOREV with real commit ids.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 55 ++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
new file mode 100644
index 0000000..7eaeb0f
--- /dev/null
+++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -0,0 +1,55 @@
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
+
+KMACHINE = "yocto/standard/preempt-rt/base"
+KMACHINE_qemux86 = "common-pc"
+KMACHINE_qemux86-64 = "common-pc-64"
+KMACHINE_qemuarm = "arm-versatile-926ejs"
+# qemuppc hangs at boot
+#KMACHINE_qemuppc = "qemu-ppc32"
+# qemumips panics at boot
+#KMACHINE_qemumips = "mti-malta32-be"
+
+KBRANCH = ${KMACHINE}
+KBRANCH_qemux86 = "yocto/standard/preempt-rt/base"
+KBRANCH_qemux86-64 = "yocto/standard/preempt-rt/base"
+KBRANCH_qemuarm = "yocto/standard/preempt-rt/base"
+#KBRANCH_qemuppc = "yocto/standard/preempt-rt/base"
+#KBRANCH_qemumips = "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_qemux86 = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
+SRCREV_machine_qemux86-64 = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
+SRCREV_machine_qemuarm = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
+#SRCREV_machine_qemuppc = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
+#SRCREV_machine_qemumips = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
+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"
+
+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
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe
2011-08-11 23:08 ` [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe Darren Hart
@ 2011-08-12 0:40 ` Bruce Ashfield
2011-08-12 2:56 ` Darren Hart
2011-08-12 3:23 ` Darren Hart
0 siblings, 2 replies; 16+ messages in thread
From: Bruce Ashfield @ 2011-08-12 0:40 UTC (permalink / raw)
To: Darren Hart; +Cc: openembedded-core
On 11-08-11 7:08 PM, Darren Hart wrote:
> Add the initial linux-yocto-rt_3.0 recipe.
>
> TODO: replace the AUTOREV with real commit ids.
I think you did this!
>
> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
> Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
> ---
> meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 55 ++++++++++++++++++++
> 1 files changed, 55 insertions(+), 0 deletions(-)
> create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>
> diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
> new file mode 100644
> index 0000000..7eaeb0f
> --- /dev/null
> +++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
> @@ -0,0 +1,55 @@
> +inherit kernel
> +require recipes-kernel/linux/linux-yocto.inc
> +
> +KMACHINE = "yocto/standard/preempt-rt/base"
I just noticed this on the way through, this could likely just
be set to "common-pc", all it really is supposed to be
is a fallback if a machine specific override doesn't work.
(I see that you actually do this in patch 8/10 for 2.6.34 anyway).
> +KMACHINE_qemux86 = "common-pc"
> +KMACHINE_qemux86-64 = "common-pc-64"
> +KMACHINE_qemuarm = "arm-versatile-926ejs"
> +# qemuppc hangs at boot
> +#KMACHINE_qemuppc = "qemu-ppc32"
> +# qemumips panics at boot
> +#KMACHINE_qemumips = "mti-malta32-be"
> +
> +KBRANCH = ${KMACHINE}
And instead of the above, you could just say:
KBRANCH = "yocto/standard/preempt-rt/base"
to have a fallback in place that keeps the fetcher chugging along.
That's all that the KMACHINE default was doing in the end anyway.
Sorry I didn't see this earlier, but seeing it in front of me
here, it jumped out.
The rest looks good.
Bruce
> +KBRANCH_qemux86 = "yocto/standard/preempt-rt/base"
> +KBRANCH_qemux86-64 = "yocto/standard/preempt-rt/base"
> +KBRANCH_qemuarm = "yocto/standard/preempt-rt/base"
> +#KBRANCH_qemuppc = "yocto/standard/preempt-rt/base"
> +#KBRANCH_qemumips = "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_qemux86 = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
> +SRCREV_machine_qemux86-64 = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
> +SRCREV_machine_qemuarm = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
> +#SRCREV_machine_qemuppc = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
> +#SRCREV_machine_qemumips = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
> +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"
> +
> +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
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe
2011-08-12 0:40 ` Bruce Ashfield
@ 2011-08-12 2:56 ` Darren Hart
2011-08-12 3:23 ` Darren Hart
1 sibling, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-12 2:56 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: openembedded-core
On 08/11/2011 05:40 PM, Bruce Ashfield wrote:
> On 11-08-11 7:08 PM, Darren Hart wrote:
>> Add the initial linux-yocto-rt_3.0 recipe.
>>
>> TODO: replace the AUTOREV with real commit ids.
>
> I think you did this!
>
>>
>> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
>> Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
>> ---
>> meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 55 ++++++++++++++++++++
>> 1 files changed, 55 insertions(+), 0 deletions(-)
>> create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>>
>> diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>> new file mode 100644
>> index 0000000..7eaeb0f
>> --- /dev/null
>> +++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>> @@ -0,0 +1,55 @@
>> +inherit kernel
>> +require recipes-kernel/linux/linux-yocto.inc
>> +
>> +KMACHINE = "yocto/standard/preempt-rt/base"
>
> I just noticed this on the way through, this could likely just
> be set to "common-pc", all it really is supposed to be
> is a fallback if a machine specific override doesn't work.
>
> (I see that you actually do this in patch 8/10 for 2.6.34 anyway).
>
>> +KMACHINE_qemux86 = "common-pc"
>> +KMACHINE_qemux86-64 = "common-pc-64"
>> +KMACHINE_qemuarm = "arm-versatile-926ejs"
>> +# qemuppc hangs at boot
>> +#KMACHINE_qemuppc = "qemu-ppc32"
>> +# qemumips panics at boot
>> +#KMACHINE_qemumips = "mti-malta32-be"
>> +
>> +KBRANCH = ${KMACHINE}
>
> And instead of the above, you could just say:
>
> KBRANCH = "yocto/standard/preempt-rt/base"
>
> to have a fallback in place that keeps the fetcher chugging along.
> That's all that the KMACHINE default was doing in the end anyway.
>
> Sorry I didn't see this earlier, but seeing it in front of me
> here, it jumped out.
>
> The rest looks good.
All good points, I'll respin and send out V2.
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe
2011-08-12 0:40 ` Bruce Ashfield
2011-08-12 2:56 ` Darren Hart
@ 2011-08-12 3:23 ` Darren Hart
2011-08-12 13:36 ` Bruce Ashfield
1 sibling, 1 reply; 16+ messages in thread
From: Darren Hart @ 2011-08-12 3:23 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: openembedded-core
On 08/11/2011 05:40 PM, Bruce Ashfield wrote:
> On 11-08-11 7:08 PM, Darren Hart wrote:
>> Add the initial linux-yocto-rt_3.0 recipe.
>>
>> TODO: replace the AUTOREV with real commit ids.
>
> I think you did this!
>
>>
>> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
>> Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
>> ---
>> meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 55 ++++++++++++++++++++
>> 1 files changed, 55 insertions(+), 0 deletions(-)
>> create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>>
>> diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>> new file mode 100644
>> index 0000000..7eaeb0f
>> --- /dev/null
>> +++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>> @@ -0,0 +1,55 @@
>> +inherit kernel
>> +require recipes-kernel/linux/linux-yocto.inc
>> +
>> +KMACHINE = "yocto/standard/preempt-rt/base"
>
> I just noticed this on the way through, this could likely just
> be set to "common-pc", all it really is supposed to be
> is a fallback if a machine specific override doesn't work.
>
> (I see that you actually do this in patch 8/10 for 2.6.34 anyway).
>
>> +KMACHINE_qemux86 = "common-pc"
>> +KMACHINE_qemux86-64 = "common-pc-64"
>> +KMACHINE_qemuarm = "arm-versatile-926ejs"
>> +# qemuppc hangs at boot
>> +#KMACHINE_qemuppc = "qemu-ppc32"
>> +# qemumips panics at boot
>> +#KMACHINE_qemumips = "mti-malta32-be"
>> +
>> +KBRANCH = ${KMACHINE}
>
> And instead of the above, you could just say:
>
> KBRANCH = "yocto/standard/preempt-rt/base"
>
> to have a fallback in place that keeps the fetcher chugging along.
> That's all that the KMACHINE default was doing in the end anyway.
>
> Sorry I didn't see this earlier, but seeing it in front of me
> here, it jumped out.
>
> The rest looks good.
>
> Bruce
Rather than resend the entire series, I have updated this patch at the
same pull URL. The new patch follows:
From 87720452dfcd4e244dd89e43aa39d9d8dc27655e Mon Sep 17 00:00:00 2001
Message-Id: <87720452dfcd4e244dd89e43aa39d9d8dc27655e.1313118839.git.dvhart@linux.intel.com>
In-Reply-To: <cover.1313118839.git.dvhart@linux.intel.com>
References: <cover.1313118839.git.dvhart@linux.intel.com>
From: Darren Hart <dvhart@linux.intel.com>
Date: Wed, 20 Jul 2011 09:18:09 -0700
Subject: [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe
Add the initial linux-yocto-rt_3.0 recipe.
qemumips and qemuppc doesn't work quite yet, so they have been omitted from
COMPATIBLE_MACHINE.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 46 ++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
new file mode 100644
index 0000000..c8a175d
--- /dev/null
+++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -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
--
1.7.6
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe
2011-08-12 3:23 ` Darren Hart
@ 2011-08-12 13:36 ` Bruce Ashfield
0 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2011-08-12 13:36 UTC (permalink / raw)
To: Darren Hart; +Cc: openembedded-core
On 11-08-11 11:23 PM, Darren Hart wrote:
>
> On 08/11/2011 05:40 PM, Bruce Ashfield wrote:
>> On 11-08-11 7:08 PM, Darren Hart wrote:
>>> Add the initial linux-yocto-rt_3.0 recipe.
>>>
>>> TODO: replace the AUTOREV with real commit ids.
>>
>> I think you did this!
>>
>>>
>>> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
>>> Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
>>> ---
>>> meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 55 ++++++++++++++++++++
>>> 1 files changed, 55 insertions(+), 0 deletions(-)
>>> create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>>>
>>> diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>>> new file mode 100644
>>> index 0000000..7eaeb0f
>>> --- /dev/null
>>> +++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>>> @@ -0,0 +1,55 @@
>>> +inherit kernel
>>> +require recipes-kernel/linux/linux-yocto.inc
>>> +
>>> +KMACHINE = "yocto/standard/preempt-rt/base"
>>
>> I just noticed this on the way through, this could likely just
>> be set to "common-pc", all it really is supposed to be
>> is a fallback if a machine specific override doesn't work.
>>
>> (I see that you actually do this in patch 8/10 for 2.6.34 anyway).
>>
>>> +KMACHINE_qemux86 = "common-pc"
>>> +KMACHINE_qemux86-64 = "common-pc-64"
>>> +KMACHINE_qemuarm = "arm-versatile-926ejs"
>>> +# qemuppc hangs at boot
>>> +#KMACHINE_qemuppc = "qemu-ppc32"
>>> +# qemumips panics at boot
>>> +#KMACHINE_qemumips = "mti-malta32-be"
>>> +
>>> +KBRANCH = ${KMACHINE}
>>
>> And instead of the above, you could just say:
>>
>> KBRANCH = "yocto/standard/preempt-rt/base"
>>
>> to have a fallback in place that keeps the fetcher chugging along.
>> That's all that the KMACHINE default was doing in the end anyway.
>>
>> Sorry I didn't see this earlier, but seeing it in front of me
>> here, it jumped out.
>>
>> The rest looks good.
>>
>> Bruce
>
> Rather than resend the entire series, I have updated this patch at the
> same pull URL. The new patch follows:
Ack'd. Looks fine to me.
Bruce
>
> From 87720452dfcd4e244dd89e43aa39d9d8dc27655e Mon Sep 17 00:00:00 2001
> Message-Id:<87720452dfcd4e244dd89e43aa39d9d8dc27655e.1313118839.git.dvhart@linux.intel.com>
> In-Reply-To:<cover.1313118839.git.dvhart@linux.intel.com>
> References:<cover.1313118839.git.dvhart@linux.intel.com>
> From: Darren Hart<dvhart@linux.intel.com>
> Date: Wed, 20 Jul 2011 09:18:09 -0700
> Subject: [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe
>
> Add the initial linux-yocto-rt_3.0 recipe.
>
> qemumips and qemuppc doesn't work quite yet, so they have been omitted from
> COMPATIBLE_MACHINE.
>
> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
> Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
> ---
> meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 46 ++++++++++++++++++++
> 1 files changed, 46 insertions(+), 0 deletions(-)
> create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
>
> diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
> new file mode 100644
> index 0000000..c8a175d
> --- /dev/null
> +++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
> @@ -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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 05/10] meta-rt: remove atom-pc support from the main layer
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (3 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 04/10] meta-rt: add linux-yocto-rt_3.0 recipe Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 06/10] meta-rt: rename minimal-rt images to -rt, drop live image Darren Hart
` (5 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
meta-rt resides in oe-core, as such it should only support the
qemu* machines. BSP layers should add support for specific
hardware platforms.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index 01a6761..d58b86b 100644
--- a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
@@ -3,7 +3,6 @@ require recipes-kernel/linux/linux-yocto.inc
KMACHINE_qemux86 = "common_pc"
KMACHINE_qemux86-64 = "common_pc_64"
-KMACHINE_atom-pc = "atom-pc"
LINUX_VERSION ?= "2.6.34"
LINUX_KERNEL_TYPE = "preempt_rt"
@@ -14,14 +13,13 @@ KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE}
SRCREV_machine_qemux86 = "439602eb6acd53d9beb8493710310214fc7bd749"
SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
-SRCREV_machine_atom-pc = "269d71029adcf4d1dbf8441f091d824478d8c87d"
SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|atom-pc)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
# this performs a fixup on the SRCREV for new/undefined BSPs
python __anonymous () {
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 06/10] meta-rt: rename minimal-rt images to -rt, drop live image
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (4 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 05/10] meta-rt: remove atom-pc support from the main layer Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 07/10] meta-rt: add an -rt-sdk image Darren Hart
` (4 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
Remove "minimal" from the image recipe names for -rt. Additional recipes types
will be added (-rt-sdk for example) and there is no need to keep so many image
type descriptors.
Drop the -live image as it is now obsolete.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../{core-image-minimal-rt.bb => core-image-rt.bb} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename meta-rt/images/{core-image-minimal-rt.bb => core-image-rt.bb} (78%)
diff --git a/meta-rt/images/core-image-minimal-rt.bb b/meta-rt/images/core-image-rt.bb
similarity index 78%
rename from meta-rt/images/core-image-minimal-rt.bb
rename to meta-rt/images/core-image-rt.bb
index 32a9b92..e11f159 100644
--- a/meta-rt/images/core-image-minimal-rt.bb
+++ b/meta-rt/images/core-image-rt.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2010 Intel Corporation.
#
-DESCRIPTION = "Minimal Real-Time Linux Image"
+DESCRIPTION = "Real-Time Linux Image"
DEPENDS = "linux-yocto-rt"
require recipes-core/images/core-image-minimal.bb
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 07/10] meta-rt: add an -rt-sdk image
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (5 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 06/10] meta-rt: rename minimal-rt images to -rt, drop live image Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 08/10] meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors Darren Hart
` (3 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
Add images including the SDK without the addition of the grapical environment or
packages.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-rt/images/core-image-rt-sdk.bb | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
create mode 100644 meta-rt/images/core-image-rt-sdk.bb
diff --git a/meta-rt/images/core-image-rt-sdk.bb b/meta-rt/images/core-image-rt-sdk.bb
new file mode 100644
index 0000000..6e98343
--- /dev/null
+++ b/meta-rt/images/core-image-rt-sdk.bb
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2011 Intel Corporation.
+#
+
+DESCRIPTION = "Real-Time Linux Image with SDK support"
+DEPENDS = "linux-yocto-rt"
+
+require recipes-core/images/core-image-minimal.bb
+
+IMAGE_FEATURES += "dev-pkgs tools-sdk"
+EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks"
+
+IMAGE_INSTALL += "rt-tests"
+
+LICENSE = "MIT"
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 08/10] meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (6 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 07/10] meta-rt: add an -rt-sdk image Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 09/10] Move meta-rt recipes to oe-core (meta) Darren Hart
` (2 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
Without a default KMACHINE and SRCREV_machine the git URL will fail to
expand to something usable and we get a parsing error. This approach was
also used in the non-rt version of this recipe.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index d58b86b..0ca53ae 100644
--- a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
@@ -1,6 +1,7 @@
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
+KMACHINE = "common-pc"
KMACHINE_qemux86 = "common_pc"
KMACHINE_qemux86-64 = "common_pc_64"
@@ -13,6 +14,7 @@ KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE}
SRCREV_machine_qemux86 = "439602eb6acd53d9beb8493710310214fc7bd749"
SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
+SRCREV_machine = "439602eb6acd53d9beb8493710310214fc7bd749"
SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
PR = "r2"
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 09/10] Move meta-rt recipes to oe-core (meta)
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (7 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 08/10] meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-11 23:08 ` [PATCH 10/10] recipes-rt: add a README documenting the contents of recipes-rt Darren Hart
2011-08-12 17:55 ` [PATCH 00/10] Refresh meta-rt and move the recipes under meta Saul Wold
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
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>
---
meta-rt/conf/layer.conf | 18 ------------------
.../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 0
.../recipes-kernel/linux/linux-yocto-rt_3.0.bb | 0
.../recipes-rt}/images/core-image-rt-sdk.bb | 0
.../recipes-rt}/images/core-image-rt.bb | 0
.../recipes-rt}/rt-tests/rt-tests_0.73.bb | 0
6 files changed, 0 insertions(+), 18 deletions(-)
delete mode 100644 meta-rt/conf/layer.conf
rename {meta-rt => meta}/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb (100%)
rename {meta-rt => meta}/recipes-kernel/linux/linux-yocto-rt_3.0.bb (100%)
rename {meta-rt => meta/recipes-rt}/images/core-image-rt-sdk.bb (100%)
rename {meta-rt => meta/recipes-rt}/images/core-image-rt.bb (100%)
rename {meta-rt/recipes-tests => meta/recipes-rt}/rt-tests/rt-tests_0.73.bb (100%)
diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf
deleted file mode 100644
index 59f42b6..0000000
--- 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
similarity index 100%
rename from meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
rename to 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
similarity index 100%
rename from meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
rename to 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
similarity index 100%
rename from meta-rt/images/core-image-rt-sdk.bb
rename to 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
similarity index 100%
rename from meta-rt/images/core-image-rt.bb
rename to 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
similarity index 100%
rename from meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb
rename to meta/recipes-rt/rt-tests/rt-tests_0.73.bb
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 10/10] recipes-rt: add a README documenting the contents of recipes-rt
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (8 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 09/10] Move meta-rt recipes to oe-core (meta) Darren Hart
@ 2011-08-11 23:08 ` Darren Hart
2011-08-12 17:55 ` [PATCH 00/10] Refresh meta-rt and move the recipes under meta Saul Wold
10 siblings, 0 replies; 16+ messages in thread
From: Darren Hart @ 2011-08-11 23:08 UTC (permalink / raw)
To: bruce.ashfield, tom.zanussi, openembedded-core
Document the non-obvious bits of using the recipes-rt recipes.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta/recipes-rt/README | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-rt/README
diff --git a/meta/recipes-rt/README b/meta/recipes-rt/README
new file mode 100644
index 0000000..7d7558d
--- /dev/null
+++ b/meta/recipes-rt/README
@@ -0,0 +1,13 @@
+The recipes-rt recipes provide package and image recipes for using and testing
+the PREEMPT_RT kernel. The core-image-rt*.bb images are minimal images with
+a couple extra packages, including rt-tests. In order to build the image with
+the linux-yocto-rt kernel, be sure to include the following line in your
+local.conf, bblayers.conf, or your $MACHINE.conf.
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
+
+If you are creating a new BSP which should use linux-yocto-rt by default,
+use the line above in the $MACHINE.conf in your BSP layer, and specify the
+following in a linux-yocto-rt bbappend recipe:
+
+COMPATIBLE_MACHINE_$MACHINE = $MACHINE
--
1.7.6
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 00/10] Refresh meta-rt and move the recipes under meta
2011-08-11 23:08 [PATCH 00/10] Refresh meta-rt and move the recipes under meta Darren Hart
` (9 preceding siblings ...)
2011-08-11 23:08 ` [PATCH 10/10] recipes-rt: add a README documenting the contents of recipes-rt Darren Hart
@ 2011-08-12 17:55 ` Saul Wold
10 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-08-12 17:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Darren Hart
On 08/11/2011 04:08 PM, Darren Hart wrote:
> This series brings the existing linux-yocto-rt recipe inline with the
> main linux-yocto recipe. It cleans up the meta-rt directory structure
> in preparation to move its contents under meta. It adds a 3.0.1-rt8
> linux-yocto recipe. Finally, it moves it all under meta and adds a
> basic README.
>
> The following changes since commit 0350be945877b61eb8125663887fd7ed1c3923ab:
>
> scripts/runqemu: Make it run on ubuntu 11.10 (2011-08-11 19:22:06 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib dvhart/rt-oe
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/rt-oe
>
> Darren Hart (10):
> meta-rt: refresh linux-yocto-rt recipe
> meta-rt: rt-tests v0.73 instead of AUTOREV
> meta-rt: canonicalize directory structure
> meta-rt: add linux-yocto-rt_3.0 recipe
> meta-rt: remove atom-pc support from the main layer
> meta-rt: rename minimal-rt images to -rt, drop live image
> meta-rt: add an -rt-sdk image
> meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors
> Move meta-rt recipes to oe-core (meta)
> recipes-rt: add a README documenting the contents of recipes-rt
>
> meta-rt/conf/layer.conf | 23 --------
> .../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 14 ++++--
> meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 55 ++++++++++++++++++++
> meta/recipes-rt/README | 13 +++++
> meta/recipes-rt/images/core-image-rt-sdk.bb | 15 +++++
> .../recipes-rt/images/core-image-rt.bb | 2 +-
> .../recipes-rt/rt-tests/rt-tests_0.73.bb | 2 +-
> 7 files changed, 95 insertions(+), 29 deletions(-)
> delete mode 100644 meta-rt/conf/layer.conf
> rename meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb => meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb (64%)
> create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
> create mode 100644 meta/recipes-rt/README
> create mode 100644 meta/recipes-rt/images/core-image-rt-sdk.bb
> rename meta-rt/images/core-image-minimal-rt.bb => meta/recipes-rt/images/core-image-rt.bb (78%)
> rename meta-rt/recipes-tests/rt-tests_git.bb => meta/recipes-rt/rt-tests/rt-tests_0.73.bb (97%)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 16+ messages in thread