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-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta-cedartrail/recipes-kernel') diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend index 68ff3ea2..5996b470 100644 --- a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend @@ -5,14 +5,16 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;b SRC_URI_cedartrail-nopvr = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" COMPATIBLE_MACHINE_cedartrail = "cedartrail" -KMACHINE_cedartrail = "yocto/standard/cedartrail" +KMACHINE_cedartrail = "cedartrail" +KBRANCH_cedartrail = "yocto/standard/cedartrail" KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc" KERNEL_FEATURES_append_cedartrail += "cfg/drm-cdvpvr.scc" KERNEL_FEATURES_append_cedartrail += "bsp/cedartrail/cedartrail-pvr-merge.scc" KERNEL_FEATURES_append_cedartrail += "cfg/efi-ext.scc" COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail" -KMACHINE_cedartrail-nopvr = "yocto/standard/cedartrail" +KMACHINE_cedartrail-nopvr = "cedartrail" +KBRANCH_cedartrail-nopvr = "yocto/standard/cedartrail" KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc" SRCREV_machine_pn-linux-yocto_cedartrail ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94" -- cgit v1.2.3-54-g00ecf