From a62c485edffed30ea95658760948fd50925adfb0 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 18 May 2012 09:19:31 -0700 Subject: linux-yocto_3.0: Update KMACHINE and KBRANCH to play nice with new kerntools The 3.0 based boards are lazy compared to our new modern ones. Without this patch, the linux-yocto-3.0 kernel do_patch() task would fail with: /srv/home/pokybuild/yocto-autobuilder/yocto-slave/cedartrail/build/build/tmp/sysroots/x86_64-linux/usr/bin/updateme: line 434: yocto/standard/cedartrail-standard.scc: No such file or directory Setting the KBRANCH explicitly avoids this issue. This brings the following recipes inline with the fri2 and sys940x BSPs. Fix proposed by Bruce Ashfield. Testing: Built linux-yocto_3.0 for all machines involved, including the nopvr, noemgd variants. All built linux-yocto_3.0 successfully. Signed-off-by: Darren Hart CC: Tom Zanussi CC: Bruce Ashfield CC: Kishore Bodke --- meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-fishriver') diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend index 4d34c2ae..6ac6ef59 100644 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend @@ -1,7 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_fishriver = "fishriver" -KMACHINE_fishriver = "yocto/standard/fishriver" +KMACHINE_fishriver = "fishriver" +KBRANCH_fishriver = "yocto/standard/fishriver" KERNEL_FEATURES_append_fishriver += " cfg/smp.scc" SRCREV_machine_pn-linux-yocto_fishriver ?= "c139592c96722727a9f074515a4061c3820da1a6" -- cgit v1.2.3-54-g00ecf