Skip to contentSkip to conversation

kernel-rt: fix build issues

PATCH Applied Darren Hart 3 participants 5 messages Apr 20, 2011 – Apr 28, 2011

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/1 kernel-rt: use correct branch names and new git SRC_REV format

In reply to Darren Hart

From: Darren Hart <[email protected]>

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 <[email protected]>
Cc Bruce Ashfield <[email protected]>
---
 meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb +5 -7
index 547f8fe..cba1321 100644
@@ -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"
Signature · 1 line
1.7.1

Darren Hart

author
#0 lore raw

cover kernel-rt: fix build issues

From: Darren Hart <[email protected]>

The linux-yocto-rt recipe wasn't building in master or bernard. This brings the recipe up to date with the linux-yocto* recipes and corrects the build failures. This patch should be applied to both bernard and master.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dvhart/bernard/rt
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/bernard/rt

Thanks,
Darren Hart <[email protected]>
---

Darren Hart (1):
kernel-rt: use correct branch names and new git SRC_REV format

 meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
Applied
#2 lore raw
Quoted 10 lines · Darren Hart

From: Darren Hart <[email protected]>

The linux-yocto-rt recipe wasn't building in master or bernard. This brings the recipe up to date with the linux-yocto* recipes and corrects the build failures. This patch should be applied to both bernard and master.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dvhart/bernard/rt
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/bernard/rt

Quoted 7 lines

Thanks,
Darren Hart <[email protected]>
---

Darren Hart (1):
kernel-rt: use correct branch names and new git SRC_REV format

Merged to master, thanks.

Richard

author
#3 lore raw
Quoted 16 lines · Richard Purdie
Quoted 15 lines · Darren Hart

From: Darren Hart <[email protected]>

The linux-yocto-rt recipe wasn't building in master or bernard. This brings the recipe up to date with the linux-yocto* recipes and corrects the build failures. This patch should be applied to both bernard and master.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dvhart/bernard/rt
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/bernard/rt

Thanks,
Darren Hart <[email protected]>
---

Quoted 4 lines
Quoted 2 lines

Darren Hart (1):
kernel-rt: use correct branch names and new git SRC_REV format

Merged to master, thanks.

Can we also merge to Bernard please? Without it, meta-rt will not build.

--
Darren

Quoted 7 lines

Richard

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#4 lore raw
Quoted 19 lines · Darren Hart
Quoted 16 lines · Richard Purdie
Quoted 15 lines · Darren Hart

From: Darren Hart<[email protected]>

The linux-yocto-rt recipe wasn't building in master or bernard. This brings the recipe up to date with the linux-yocto* recipes and corrects the build failures. This patch should be applied to both bernard and master.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dvhart/bernard/rt
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/bernard/rt

Thanks,
Darren Hart<[email protected]>
---

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Darren Hart (1):
kernel-rt: use correct branch names and new git SRC_REV format

Merged to master, thanks.

Can we also merge to Bernard please? Without it, meta-rt will not build.

Staged into the stage/bernard area.

Sau!

Quoted 11 lines

--
Darren

Quoted 7 lines

Richard

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky