Initial Real-Time Linux recipes
cover Initial Real-Time Linux recipes
This patch provides an initial set of PREEMPT_RT kernel and related test and image recipes. The poky-image-minimal-rt image has been boot tested on qemux86-64, and that is currently the only "COMPATIBLE_MACHINE". More will be added as they are tested and confirmed working.
To make use of the rt-tests pacakge included in the new images, you need to select linux-yocto-rt as the preferred kernel provider in your local.conf or in a supported machine config. qemu.inc has been updated to allow for the setting of the kernel provider in your local.conf.
It was my intent to have the image specify the require kernel, but things don't really work that way. As such, it may be that having the images just to add rt-tests is overkill and unecessarily pollutes the images directory. I'm open to ideas on how to best go about building rt images.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dvhart/rt
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/rt
Thanks,
Darren Hart <[email protected]>
---
Darren Hart (4):
linux-yocto-rt: initial PREEMPT_RT recipe for the linux-yocto stable
kernel
rt-tests: add the PREEMPT_RT rt-tests testsuite and recipes-tests
directory
poky-image-minimal-rt*: Add initial real-time image recipes machine/qemu: Allow for users to override the preferred kernel
version
.../conf/distro/include/poky-default-revisions.inc | 3 + meta/conf/machine/include/qemu.inc | 2 +- .../images/poky-image-minimal-rt-directdisk.bb | 15 ++++++ .../images/poky-image-minimal-rt-live.bb | 15 ++++++ meta/recipes-core/images/poky-image-minimal-rt.bb | 15 ++++++ .../linux/linux-yocto-rt_stablegit.bb | 47 ++++++++++++++++++++ meta/recipes-tests/rt/rt-tests_git.bb | 22 +++++++++ 7 files changed, 118 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-core/images/poky-image-minimal-rt-directdisk.bb create mode 100644 meta/recipes-core/images/poky-image-minimal-rt-live.bb create mode 100644 meta/recipes-core/images/poky-image-minimal-rt.bb create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb create mode 100644 meta/recipes-tests/rt/rt-tests_git.bb
Signature · 1 line
1.7.2.3
PATCH 1/4 linux-yocto-rt: initial PREEMPT_RT recipe for the linux-yocto stable kernel
--- .../conf/distro/include/poky-default-revisions.inc | 3 + .../linux/linux-yocto-rt_stablegit.bb | 47 ++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb
meta/conf/distro/include/poky-default-revisions.inc +3 -0
@@ -95,6 +95,9 @@ SRCREV_machine_pn-linux-yocto-stable_routerstationpro ?= "2ec2edaf256dd8500ee3d4 SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f" SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" SRCREV_meta_pn-linux-yocto-stable ?= "50ccd2b3213b6a1bacb3f898c035119802dac420" +# preempt_rt SRCREVs +SRCREV_machine_pn-linux-yocto-rt_qemux86-64 ?= "f49444f06875894389e640bcda6c3f6ceb1f0c3e" +SRCREV_meta_pn-linux-yocto-rt ?= "50ccd2b3213b6a1bacb3f898c035119802dac420" # development SRCREVs SRCREV_machine_pn-linux-yocto_qemuarm = "87e00a2d47ba80b4ad1f9170cb3f6cf81f21d739" SRCREV_machine_pn-linux-yocto_qemumips = "7231e473dd981a28e3cea9f677ed60583e731550"
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 3/4 poky-image-minimal-rt*: Add initial real-time image recipes
In reply to Darren HartAdd poky-image-minimal-rt* image recipes. They are based on the minimal recipe and add rt-tests for basic evaluation of a board with a PREEMPT_RT kernel.
--- .../images/poky-image-minimal-rt-directdisk.bb | 15 +++++++++++++++ .../images/poky-image-minimal-rt-live.bb | 15 +++++++++++++++ meta/recipes-core/images/poky-image-minimal-rt.bb | 15 +++++++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/images/poky-image-minimal-rt-directdisk.bb create mode 100644 meta/recipes-core/images/poky-image-minimal-rt-live.bb create mode 100644 meta/recipes-core/images/poky-image-minimal-rt.bb
meta/recipes-core/images/poky-image-minimal-rt-directdisk.bb new file +15 -0
@@ -0,0 +1,15 @@ +# +# Copyright (C) 2010 Intel Corporation. +# + +require poky-image-directdisk.inc + +DESCRIPTION = "Bootable Minimal Real-Time Direct Disk Image" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-rt-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootdirectdisk[depends] += "poky-image-minimal-rt:do_rootfs" + +
meta/recipes-core/images/poky-image-minimal-rt-live.bb new file +15 -0
@@ -0,0 +1,15 @@ +# +# Copyright (C) 2010 Intel Corporation. +# + +DESCRIPTION = "Bootable Live Minimal Real-Time Linux Image" + +require recipes-core/images/poky-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-rt-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "poky-image-minimal-rt:do_rootfs"
meta/recipes-core/images/poky-image-minimal-rt.bb new file +15 -0
@@ -0,0 +1,15 @@ +# +# Copyright (C) 2010 Intel Corporation. +# + +# For best results, be sure to select a PREEMPT_RT kernel in your machine +# config or in your local.conf. For example: +# PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-rt" + +DESCRIPTION = "Minimal Real-Time Linux Image" + +require recipes-core/images/poky-image-minimal.bb + +IMAGE_INSTALL += "rt-tests" + +LICENSE = "MIT"
Signature · 1 line
1.7.2.3
PATCH 4/4 machine/qemu: Allow for users to override the preferred kernel version
In reply to Darren HartThe linux-yocto-rt kernel has been boot tested on qemux86-64. Unlock the preferred provider for virtual/kernel so it can be selected and used.
--- meta/conf/machine/include/qemu.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/machine/include/qemu.inc +1 -1
@@ -15,7 +15,7 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000" RDEPENDS_kernel-base = "" # Use a common kernel recipe for all QEMU machines -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
Signature · 1 line
1.7.2.3
PATCH 2/4 rt-tests: add the PREEMPT_RT rt-tests testsuite and recipes-tests directory
In reply to Darren HartThe rt-tests test-suite is a collection of tests meant to measure the latency and determinism of the Linux PREEMPT_RT kernel.
--- meta/recipes-tests/rt/rt-tests_git.bb | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-tests/rt/rt-tests_git.bb
meta/recipes-tests/rt/rt-tests_git.bb new file +22 -0
@@ -0,0 +1,22 @@ +DESCRIPTION = "Real-Time preemption testcases" +HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" +SECTION = "tests" +DEPENDS = "linux-libc-headers eglibc" +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} +PV = "git${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git;protocol=git" + +S = "${WORKDIR}/git" + +CFLAGS += "-I${S}/src/include -D_GNU_SOURCE -Wall -Wno-nonnull" + +do_install() { + oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \ + INCLUDEDIR=${includedir} +}
Signature · 1 line
1.7.2.3
Please disregard this thread and respond to the (RESEND) to follow. I had an error in the recipients.
Signature · 2 lines
Darren Hart Yocto Linux Kernel
Re: [PATCH 1/4] linux-yocto-rt: initial PREEMPT_RT recipe for the linux-yocto stable kernel
In reply to Darren HartQuoted 27 lines · Darren Hart
Signed-off-by Darren Hart <[email protected]>---
.../conf/distro/include/poky-default-revisions.inc | 3 + .../linux/linux-yocto-rt_stablegit.bb | 47 ++++++++++++++++++++2 files changed, 50 insertions(+), 0 deletions(-)create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb
meta/conf/distro/include/poky-default-revisions.inc +0
-0@@ -95,6 +95,9 @@ SRCREV_machine_pn-linux-yocto-stable_routerstationpro ?= "2ec2edaf256dd8500ee3d4SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "
986e6eb66c26007cee7916d5d12f4756e6b5436f" SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" SRCREV_meta_pn-linux-yocto-stable ?= "50ccd2b3213b6a1bacb3f898c035119802dac420"meta/conf/distro/include/poky-default-revisions.inc +3
-0+# preempt_rt SRCREVs +SRCREV_machine_pn-linux-yocto-rt_qemux86-64 ?= "f49444f06875894389e640bcda6c3f6ceb1f0c3e" +SRCREV_meta_pn-linux-yocto-rt ?= "50ccd2b3213b6a1bacb3f898c035119802dac420"# development SRCREVs SRCREV_machine_pn-linux-yocto_qemuarm = "87e00a2d47ba80b4ad1f9170cb3f6cf81f21d739" SRCREV_machine_pn-linux-yocto_qemumips = "7231e473dd981a28e3cea9f677ed60583e731550"meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +0
-0
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 4
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0@@ -0,0 +1,47 @@ +inherit kernel +require linux-yocto.inc + +KMACHINE_qemux86 = "common_pc/base"
For stable, this one would be common_pc, which I see points out a bug in the -stable recipe. I'll fix that one in the morning.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 16
Quoted 12 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +12
-0+KMACHINE_qemux86-64 = "common_pc_64" +KMACHINE_qemuppc = "qemu_ppc32" +KMACHINE_qemumips = "mti_malta32_be" +KMACHINE_qemuarm = "arm_versatile_926ejs" +KMACHINE_atom-pc = "atom-pc" +KMACHINE_routerstationpro = "routerstationpro" +KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" +KMACHINE_beagleboard = "beagleboard" + +LINUX_VERSION ?= "2.6.34" +LINUX_KERNEL_TYPE = "preempt_rt" +LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}"
In the initial factoring of the recipes had these in a common location, but when the -stable and -dev kernels split the branching I had to move the branch specifications, kernel version and extension into the specific recipe files and out of the includes (since they were different).
If we end up with a proliferation of recipes, it does make sense to create a stablegit.inc and devgit.inc (or some other suitable names), since we clearly don't want to repeat the machie mappings, and extension everywhere. I'll toss that into an upcoming series.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 20
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0+ +PR = "r0" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRCREV_FORMAT = "meta_machine"
Same as this, we can make this part of an include
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0+ +COMPATIBLE_MACHINE = "(qemux86-64)" + +# this performs a fixup on the SRCREV for new/undefined BSPs
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 34
Quoted 10 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +10
-0+python __anonymous () { + import bb, re, string + + rev = bb.data.getVar("SRCREV_machine", d, 1) + if rev == "standard": + bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d) + + kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") + bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) +}
This can probably go away soon, either to somewhere common, or away completely but for now it is required.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 37
Quoted 3 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +3
-0+ +SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ + git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
This should be inherited as well, more to factor out, good to see more recipes that highlight what I missed.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 45
Quoted 8 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +8
-0+ +# 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
Probably the tasks as well. Something to try at least.
But it looks good, not as small as we'd want, but getting there. Having too small a recipe with everything factored out is also bad, but the arcane parts should at least be made common.
Bruce
Quoted 10 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +2
-1+ +require linux-tools.inc --1.7.2.3
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 4/4] machine/qemu: Allow for users to override the preferred kernel version
In reply to Darren HartQuoted 3 lines · Darren Hart
The linux-yocto-rt kernel has been boot tested on qemux86-64. Unlock the preferred provider for virtual/kernel so it can be selected and used.
We definitely need this.
Bruce
Quoted 27 lines
Signed-off-by Darren Hart <[email protected]>---
meta/conf/machine/include/qemu.inc | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)meta/conf/machine/include/qemu.inc +0
-0@@ -15,7 +15,7 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000"RDEPENDS_kernel-base = ""
# Use a common kernel recipe for all QEMU machines
meta/conf/machine/include/qemu.inc +1
-1-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" --
1.7.2.3_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 1/4] linux-yocto-rt: initial PREEMPT_RT recipe for the linux-yocto stable kernel
In reply to Bruce AshfieldQuoted 102 lines · Bruce Ashfield
Quoted 27 lines · Darren Hart
Signed-off-by Darren Hart<[email protected]>--- .../conf/distro/include/poky-default-revisions.inc | 3 + .../linux/linux-yocto-rt_stablegit.bb | 47 ++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-)create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb
meta/conf/distro/include/poky-default-revisions.inc +3
-0@@ -95,6 +95,9 @@ SRCREV_machine_pn-linux-yocto-stable_routerstationpro ?= "2ec2edaf256dd8500ee3d4 SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f" SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" SRCREV_meta_pn-linux-yocto-stable ?= "50ccd2b3213b6a1bacb3f898c035119802dac420" +# preempt_rt SRCREVs +SRCREV_machine_pn-linux-yocto-rt_qemux86-64 ?= "f49444f06875894389e640bcda6c3f6ceb1f0c3e" +SRCREV_meta_pn-linux-yocto-rt ?= "50ccd2b3213b6a1bacb3f898c035119802dac420" # development SRCREVs SRCREV_machine_pn-linux-yocto_qemuarm = "87e00a2d47ba80b4ad1f9170cb3f6cf81f21d739" SRCREV_machine_pn-linux-yocto_qemumips = "7231e473dd981a28e3cea9f677ed60583e731550"meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +0
-0meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 4
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0@@ -0,0 +1,47 @@ +inherit kernel +require linux-yocto.inc + +KMACHINE_qemux86 = "common_pc/base"For stable, this one would be
common_pc, which I see points out a bug in the -stable recipe. I'll fix that one in the morning.meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 16
Quoted 12 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +12
-0+KMACHINE_qemux86-64 = "common_pc_64" +KMACHINE_qemuppc = "qemu_ppc32" +KMACHINE_qemumips = "mti_malta32_be" +KMACHINE_qemuarm = "arm_versatile_926ejs" +KMACHINE_atom-pc = "atom-pc" +KMACHINE_routerstationpro = "routerstationpro" +KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" +KMACHINE_beagleboard = "beagleboard" + +LINUX_VERSION ?= "2.6.34" +LINUX_KERNEL_TYPE = "preempt_rt" +LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}"In the initial factoring of the recipes had these in a common location, but when the -stable and -dev kernels split the branching I had to move the branch specifications, kernel version and extension into the specific recipe files and out of the includes (since they were different).
If we end up with a proliferation of recipes, it does make sense to create a stablegit.inc and devgit.inc (or some other suitable names), since we clearly don't want to repeat the machie mappings, and extension everywhere. I'll toss that into an upcoming series.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 20
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0+ +PR = "r0" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRCREV_FORMAT = "meta_machine"Same as this, we can make this part of an include
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0+ +COMPATIBLE_MACHINE = "(qemux86-64)" + +# this performs a fixup on the SRCREV for new/undefined BSPsmeta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 34
Quoted 10 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +10
-0+python __anonymous () { + import bb, re, string + + rev = bb.data.getVar("SRCREV_machine", d, 1) + if rev == "standard": + bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d) + + kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") + bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) +}This can probably go away soon, either to somewhere common, or away completely but for now it is required.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 37
Quoted 3 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +3
-0+ +SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ + git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"This should be inherited as well, more to factor out, good to see more recipes that highlight what I missed.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 45
Quoted 8 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +8
-0+ +# 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_checkoutProbably the tasks as well. Something to try at least.
Quoted 3 lines
But it looks good, not as small as we'd want, but getting there. Having too small a recipe with everything factored out is also bad, but the arcane parts should at least be made common.
Agreed on all points. Much of the above should be in an include. I think we should keep "COMPATIBLE MACHINES", "KERNEL_FEATURES", and possible "KMACHINE_*" in each recipe instance. Or are we better off to just override them in each instance?
Signature · 2 lines
Darren Hart Yocto Linux Kernel
Re: [PATCH 1/4] linux-yocto-rt: initial PREEMPT_RT recipe for the linux-yocto stable kernel
Quoted 127 lines · Darren Hart
Quoted 121 lines · Bruce Ashfield
Quoted 39 lines · Darren Hart
Signed-off-by Darren Hart<[email protected]>---
.../conf/distro/include/poky-default-revisions.inc | 3 + .../linux/linux-yocto-rt_stablegit.bb | 47
++++++++++++++++++++2 files changed, 50 insertions(+), 0 deletions(-)create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb
meta/conf/distro/include/poky-default-revisions.inc +0
-0@@ -95,6 +95,9 @@ SRCREV_machine_pn-linux-yocto-stable_routerstationpro?= "
2ec2edaf256dd8500ee3d4SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f" SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" SRCREV_meta_pn-linux-yocto-stable ?= "50ccd2b3213b6a1bacb3f898c035119802dac420"meta/conf/distro/include/poky-default-revisions.inc +2
-0+# preempt_rt SRCREVs +SRCREV_machine_pn-linux-yocto-rt_qemux86-64 ?="
f49444f06875894389e640bcda6c3f6ceb1f0c3e"
+SRCREV_meta_pn-linux-yocto-rt ?=
"50ccd2b3213b6a1bacb3f898c035119802dac420"# development SRCREVs SRCREV_machine_pn-linux-yocto_qemuarm = "87e00a2d47ba80b4ad1f9170cb3f6cf81f21d739" SRCREV_machine_pn-linux-yocto_qemumips = "7231e473dd981a28e3cea9f677ed60583e731550"meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +0
-0meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 4
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0@@ -0,0 +1,47 @@ +inherit kernel +require linux-yocto.inc + +KMACHINE_qemux86 = "common_pc/base"For stable, this one would be
common_pc, which I see points out a bug in the -stable recipe. I'll fix that one in the morning.meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 16
Quoted 12 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +12
-0+KMACHINE_qemux86-64 = "common_pc_64" +KMACHINE_qemuppc = "qemu_ppc32" +KMACHINE_qemumips = "mti_malta32_be" +KMACHINE_qemuarm = "arm_versatile_926ejs" +KMACHINE_atom-pc = "atom-pc" +KMACHINE_routerstationpro = "routerstationpro" +KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" +KMACHINE_beagleboard = "beagleboard" + +LINUX_VERSION ?= "2.6.34" +LINUX_KERNEL_TYPE = "preempt_rt" +LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}"In the initial factoring of the recipes had these in a common location, but
when the -stable and -dev kernels split the branching I had to move the branch specifications, kernel version and extension into the specific recipe files and out of the includes (since they were different).If we end up with a proliferation of recipes, it does make sense to create a stablegit.inc and devgit.inc (or some other suitable names), since we clearly don't want to repeat the machie mappings, and extension everywhere. I'll toss that into an upcoming series.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 20
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +4
-0+ +PR = "r0" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRCREV_FORMAT = "meta_machine"Same as this, we can make this part of an include
Quoted 12 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +12
-0+ +COMPATIBLE_MACHINE = "(qemux86-64)" + +# this performs a fixup on the SRCREV for new/undefined BSPs +python __anonymous () { + import bb, re, string + + rev = bb.data.getVar("SRCREV_machine", d, 1) + if rev == "standard": + bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d) + + kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d),Quoted 3 lines
"_", "-")
+ bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) +}This can probably go away soon, either to somewhere common, or away completely but for now it is required.
Quoted 6 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +2
-0+ +SRC_URI ="
git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine\
+git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"This should be inherited as well, more to factor out, good to see more recipes that highlight what I missed.
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb line 45
Quoted 8 lines
meta/recipes-kernel/linux/linux-yocto-rt_stablegit.bb new file +8
-0+ +# 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_checkoutProbably the tasks as well. Something to try at least.
Quoted 4 lines
But it looks good, not as small as we'd want, but getting there. Having too small a recipe with everything factored out is also bad, but the arcane
parts should at least be made common.
Quoted 4 lines
Agreed on all points. Much of the above should be in an include. I think we should keep "COMPATIBLE MACHINES", "
KERNEL_FEATURES", and possible "KMACHINE_*" in each recipe instance. Or are we better off to just override them in each instance?
compatible machines: per-recipekernel_features: per-recipe
kmachine_*: common. It is a mapping of machines to branches, not a guarantee that they'll work for every recipe. So having the base recipe (stable vs dev) have
the full list of mappings makes sense.
I've made most of the changes here and will run some tests and send them out for merging.
cheers,
Bruce
Quoted 5 lines
--
Darren Hart
Yocto Linux Kernel
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 0/4] Initial Real-Time Linux recipes (DO NOT PULL)
In reply to Darren HartQuoted 12 lines · Darren Hart
RESEND: corrected Bruce's email address, apologies for the duplicate
This patch provides an initial set of
PREEMPT_RTkernel and related test and image recipes. The poky-image-minimal-rt image has been boot tested on qemux86-64, and that is currently the only "COMPATIBLE_MACHINE". More will be added as they are tested and confirmed working.To make use of the rt-tests pacakge included in the new images, you need to select linux-yocto-rt as the preferred kernel provider in your local.conf or in a supported machine config. qemu.inc has been updated to allow for the setting of the kernel provider in your local.conf.
Quoted 5 lines
It was my intent to have the image specify the require kernel, but things don't really work that way. As such, it may be that having the images just to add rt-tests is overkill and unecessarily pollutes the images directory. I'm open to ideas on how to best go about building rt images.
I'll be redoing these as meta-rt layer and rebase them on fixes to the stable kernel recipe from Bruce. Please DO NOT PULL.
--
Darren Hart
Yocto Linux Kernel