diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2011-04-19 16:54:38 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 02:17:49 +0100 |
| commit | 690e87a2ffe8caa16379be26eb356c5bded17c1f (patch) | |
| tree | d218c40af33e8ce7409b3f22b8fc8968407c3923 /meta-rt/recipes-kernel | |
| parent | 64d5038c1b36a8e2bc96ffb9f8ccfea0dec473d8 (diff) | |
| download | openembedded-core-690e87a2ffe8caa16379be26eb356c5bded17c1f.tar.gz openembedded-core-690e87a2ffe8caa16379be26eb356c5bded17c1f.tar.bz2 openembedded-core-690e87a2ffe8caa16379be26eb356c5bded17c1f.zip | |
kernel-rt: use correct branch names and new git SRC_REV format
The RT kernel recipe was not updated to reflect the new git SRC_REV format nor
to take advantage of the recent updates made to the underlying infrastructure.
These fixes bring it up to date with the other linux-yocto* recipes and fix
various build issues people were seeing.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-rt/recipes-kernel')
| -rw-r--r-- | meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb b/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb index 547f8feac3..cba132176a 100644 --- a/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb +++ b/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb @@ -8,7 +8,10 @@ LINUX_VERSION ?= "2.6.34" LINUX_KERNEL_TYPE = "preempt_rt" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" -PR = "r0" +KMETA = wrs_meta +KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE} + +PR = "r1" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" @@ -18,16 +21,11 @@ COMPATIBLE_MACHINE = "(qemux86-64|atom-pc)" 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) } -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" +SRC_URI = "git://git.yoctoproject.org/linux-2.6-windriver.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta" # Functionality flags KERNEL_REVISION_CHECKING ?= "t" |