diff options
author | Darren Hart <dvhart@linux.intel.com> | 2012-05-18 09:19:31 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2012-05-23 11:22:03 -0700 |
commit | a62c485edffed30ea95658760948fd50925adfb0 (patch) | |
tree | 6421f4982bd1557a73aaec1a189587ec1a2918c3 /meta-cedartrail/recipes-kernel | |
parent | cb711ad2d9606ab8b5679d3a96dcb16c07cb258b (diff) | |
download | meta-intel-a62c485edffed30ea95658760948fd50925adfb0.tar.gz |
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 <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
CC: Kishore Bodke <kishore.k.bodke@intel.com>
Diffstat (limited to 'meta-cedartrail/recipes-kernel')
-rw-r--r-- | meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend | 6 |
1 files changed, 4 insertions, 2 deletions
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 | |||
5 | SRC_URI_cedartrail-nopvr = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" | 5 | SRC_URI_cedartrail-nopvr = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" |
6 | 6 | ||
7 | COMPATIBLE_MACHINE_cedartrail = "cedartrail" | 7 | COMPATIBLE_MACHINE_cedartrail = "cedartrail" |
8 | KMACHINE_cedartrail = "yocto/standard/cedartrail" | 8 | KMACHINE_cedartrail = "cedartrail" |
9 | KBRANCH_cedartrail = "yocto/standard/cedartrail" | ||
9 | KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc" | 10 | KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc" |
10 | KERNEL_FEATURES_append_cedartrail += "cfg/drm-cdvpvr.scc" | 11 | KERNEL_FEATURES_append_cedartrail += "cfg/drm-cdvpvr.scc" |
11 | KERNEL_FEATURES_append_cedartrail += "bsp/cedartrail/cedartrail-pvr-merge.scc" | 12 | KERNEL_FEATURES_append_cedartrail += "bsp/cedartrail/cedartrail-pvr-merge.scc" |
12 | KERNEL_FEATURES_append_cedartrail += "cfg/efi-ext.scc" | 13 | KERNEL_FEATURES_append_cedartrail += "cfg/efi-ext.scc" |
13 | 14 | ||
14 | COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail" | 15 | COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail" |
15 | KMACHINE_cedartrail-nopvr = "yocto/standard/cedartrail" | 16 | KMACHINE_cedartrail-nopvr = "cedartrail" |
17 | KBRANCH_cedartrail-nopvr = "yocto/standard/cedartrail" | ||
16 | KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc" | 18 | KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc" |
17 | 19 | ||
18 | SRCREV_machine_pn-linux-yocto_cedartrail ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94" | 20 | SRCREV_machine_pn-linux-yocto_cedartrail ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94" |