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 | |
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>
8 files changed, 20 insertions, 10 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" |
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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
4 | KMACHINE_crownbay = "yocto/standard/crownbay" | 4 | KMACHINE_crownbay = "crownbay" |
5 | KBRANCH_crownbay = "yocto/standard/crownbay" | ||
5 | KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" | 6 | KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" |
6 | 7 | ||
7 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | 8 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" |
8 | KMACHINE_crownbay-noemgd = "yocto/standard/crownbay" | 9 | KMACHINE_crownbay-noemgd = "crownbay" |
10 | KBRANCH_crownbay-noemgd = "yocto/standard/crownbay" | ||
9 | KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" | 11 | KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" |
10 | 12 | ||
11 | SRCREV_machine_pn-linux-yocto_crownbay ?= "63c65842a3a74e4bd3128004ac29b5639f16433f" | 13 | SRCREV_machine_pn-linux-yocto_crownbay ?= "63c65842a3a74e4bd3128004ac29b5639f16433f" |
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.0.bbappend index 304d476a..85a4cbe6 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.0.bbappend | |||
@@ -1,7 +1,8 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_emenlow = "emenlow" | 3 | COMPATIBLE_MACHINE_emenlow = "emenlow" |
4 | KMACHINE_emenlow = "yocto/standard/emenlow" | 4 | KMACHINE_emenlow = "emenlow" |
5 | KBRANCH_emenlow = "yocto/standard/emenlow" | ||
5 | KERNEL_FEATURES_append_emenlow += " cfg/smp.scc" | 6 | KERNEL_FEATURES_append_emenlow += " cfg/smp.scc" |
6 | 7 | ||
7 | SRCREV_machine_pn-linux-yocto_emenlow ?= "0b13bbbc423fea345fd537792284ccf388809e5b" | 8 | SRCREV_machine_pn-linux-yocto_emenlow ?= "0b13bbbc423fea345fd537792284ccf388809e5b" |
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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_fishriver = "fishriver" | 3 | COMPATIBLE_MACHINE_fishriver = "fishriver" |
4 | KMACHINE_fishriver = "yocto/standard/fishriver" | 4 | KMACHINE_fishriver = "fishriver" |
5 | KBRANCH_fishriver = "yocto/standard/fishriver" | ||
5 | KERNEL_FEATURES_append_fishriver += " cfg/smp.scc" | 6 | KERNEL_FEATURES_append_fishriver += " cfg/smp.scc" |
6 | 7 | ||
7 | SRCREV_machine_pn-linux-yocto_fishriver ?= "c139592c96722727a9f074515a4061c3820da1a6" | 8 | SRCREV_machine_pn-linux-yocto_fishriver ?= "c139592c96722727a9f074515a4061c3820da1a6" |
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend index 127d8859..1cc7f56f 100644 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend | |||
@@ -2,7 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
2 | 2 | ||
3 | COMPATIBLE_MACHINE_jasperforest = "jasperforest" | 3 | COMPATIBLE_MACHINE_jasperforest = "jasperforest" |
4 | 4 | ||
5 | KMACHINE_jasperforest = "yocto/standard/common-pc-64/jasperforest" | 5 | KMACHINE_jasperforest = "jasperforest" |
6 | KBRANCH_jasperforest = "yocto/standard/common-pc-64/jasperforest" | ||
6 | 7 | ||
7 | SRCREV_machine_pn-linux-yocto_jasperforest ?= "fc10a49bed173ade9c6c076241a448639fe50aa8" | 8 | SRCREV_machine_pn-linux-yocto_jasperforest ?= "fc10a49bed173ade9c6c076241a448639fe50aa8" |
8 | SRCREV_meta_pn-linux-yocto_jasperforest ?= "59314a3523e360796419d76d78c6f7d8c5ef2593" | 9 | SRCREV_meta_pn-linux-yocto_jasperforest ?= "59314a3523e360796419d76d78c6f7d8c5ef2593" |
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_3.0.bbappend index 5fd298e2..4590c272 100644 --- a/meta-n450/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-n450/recipes-kernel/linux/linux-yocto_3.0.bbappend | |||
@@ -1,6 +1,7 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | COMPATIBLE_MACHINE_n450 = "n450" | 2 | COMPATIBLE_MACHINE_n450 = "n450" |
3 | KMACHINE_n450 = "yocto/standard/common-pc/atom-pc" | 3 | KMACHINE_n450 = "atom-pc" |
4 | KBRANCH_n450 = "yocto/standard/common-pc/atom-pc" | ||
4 | 5 | ||
5 | # The n450 is a single core hypterthreaded CPU | 6 | # The n450 is a single core hypterthreaded CPU |
6 | KERNEL_FEATURES_append_n450 += " cfg/smp.scc" | 7 | KERNEL_FEATURES_append_n450 += " cfg/smp.scc" |
diff --git a/meta-romley/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-romley/recipes-kernel/linux/linux-yocto_3.0.bbappend index 02e231cc..021f4664 100644 --- a/meta-romley/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-romley/recipes-kernel/linux/linux-yocto_3.0.bbappend | |||
@@ -1,7 +1,8 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_romley = "romley" | 3 | COMPATIBLE_MACHINE_romley = "romley" |
4 | KMACHINE_romley = "yocto/standard/common-pc-64/romley" | 4 | KMACHINE_romley = "romley" |
5 | KBRANCH_romley = "yocto/standard/common-pc-64/romley" | ||
5 | 6 | ||
6 | SRCREV_machine_pn-linux-yocto_romley ?= "d26ab3559d75d0a3946ecaef67d3aeb7e9e7ef22" | 7 | SRCREV_machine_pn-linux-yocto_romley ?= "d26ab3559d75d0a3946ecaef67d3aeb7e9e7ef22" |
7 | SRCREV_meta_pn-linux-yocto_romley ?= "67ce7623909cef63927fd145026aaf371cf4abf1" | 8 | SRCREV_meta_pn-linux-yocto_romley ?= "67ce7623909cef63927fd145026aaf371cf4abf1" |
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.0.bbappend index c46f6fbd..58de27ae 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.0.bbappend | |||
@@ -1,7 +1,8 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_sugarbay = "sugarbay" | 3 | COMPATIBLE_MACHINE_sugarbay = "sugarbay" |
4 | KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" | 4 | KMACHINE_sugarbay = "sugarbay" |
5 | KBRANCH_sugarbay = "yocto/standard/common-pc-64/sugarbay" | ||
5 | 6 | ||
6 | SRCREV_machine_pn-linux-yocto_sugarbay ?= "162abf381df130fbf6ba8df353821fa684e59dfa" | 7 | SRCREV_machine_pn-linux-yocto_sugarbay ?= "162abf381df130fbf6ba8df353821fa684e59dfa" |
7 | SRCREV_meta_pn-linux-yocto_sugarbay ?= "59314a3523e360796419d76d78c6f7d8c5ef2593" | 8 | SRCREV_meta_pn-linux-yocto_sugarbay ?= "59314a3523e360796419d76d78c6f7d8c5ef2593" |