From 3b2fb9c103c126aff1370f4b98a91649aa70e36b Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 20 Jul 2011 09:08:06 -0700 Subject: meta-rt: canonicalize directory structure Use the more standard recipes-*/*/*.bb layout. Signed-off-by: Darren Hart --- meta-rt/conf/layer.conf | 5 ++- meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb | 44 ---------------------- .../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 44 ++++++++++++++++++++++ meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb | 22 +++++++++++ meta-rt/recipes-tests/rt-tests_0.73.bb | 22 ----------- 5 files changed, 69 insertions(+), 68 deletions(-) delete mode 100644 meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb create mode 100644 meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb delete mode 100644 meta-rt/recipes-tests/rt-tests_0.73.bb (limited to 'meta-rt') diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf index f105405784..59f42b62fe 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-yocto-rt_2.6.34.bb deleted file mode 100644 index 01a6761f7a..0000000000 --- a/meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb +++ /dev/null @@ -1,44 +0,0 @@ -inherit kernel -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" -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_atom-pc = "269d71029adcf4d1dbf8441f091d824478d8c87d" -SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b" - -PR = "r2" -PV = "${LINUX_VERSION}+git${SRCPV}" -SRCREV_FORMAT = "meta_machine" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|atom-pc)" - -# 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 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 new file mode 100644 index 0000000000..01a6761f7a --- /dev/null +++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb @@ -0,0 +1,44 @@ +inherit kernel +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" +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_atom-pc = "269d71029adcf4d1dbf8441f091d824478d8c87d" +SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b" + +PR = "r2" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRCREV_FORMAT = "meta_machine" + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|atom-pc)" + +# 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 diff --git a/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb b/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb new file mode 100644 index 0000000000..6334bcdeef --- /dev/null +++ b/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb @@ -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 = v0.73 +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} +} diff --git a/meta-rt/recipes-tests/rt-tests_0.73.bb b/meta-rt/recipes-tests/rt-tests_0.73.bb deleted file mode 100644 index 6334bcdeef..0000000000 --- a/meta-rt/recipes-tests/rt-tests_0.73.bb +++ /dev/null @@ -1,22 +0,0 @@ -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 = v0.73 -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} -} -- cgit 1.2.3-korg