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-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta-crownbay') diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend index 505d8999..0c92871b 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend @@ -1,11 +1,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_crownbay = "crownbay" -KMACHINE_crownbay = "yocto/standard/crownbay" +KMACHINE_crownbay = "crownbay" +KBRANCH_crownbay = "yocto/standard/crownbay" KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" -KMACHINE_crownbay-noemgd = "yocto/standard/crownbay" +KMACHINE_crownbay-noemgd = "crownbay" +KBRANCH_crownbay-noemgd = "yocto/standard/crownbay" KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" SRCREV_machine_pn-linux-yocto_crownbay ?= "63c65842a3a74e4bd3128004ac29b5639f16433f" -- cgit v1.2.3-54-g00ecf