MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux-yocto_3.0: Update KMACHINE and KBRANCH to play nice with new kerntools

Browse Source 
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>
This commit is contained in:
Darren Hart 2012-05-18 09:19:31 -07:00
parent cb711ad2d9
commit a62c485edf
8 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -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"

6
meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -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"

3
meta-emenlow/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -1,7 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_emenlow = "emenlow"
KMACHINE_emenlow = "yocto/standard/emenlow"
KMACHINE_emenlow = "emenlow"
KBRANCH_emenlow = "yocto/standard/emenlow"
KERNEL_FEATURES_append_emenlow += " cfg/smp.scc"
SRCREV_machine_pn-linux-yocto_emenlow ?= "0b13bbbc423fea345fd537792284ccf388809e5b"

3
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -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"

3
meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -2,7 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_jasperforest = "jasperforest"
KMACHINE_jasperforest = "yocto/standard/common-pc-64/jasperforest"
KMACHINE_jasperforest = "jasperforest"
KBRANCH_jasperforest = "yocto/standard/common-pc-64/jasperforest"
SRCREV_machine_pn-linux-yocto_jasperforest ?= "fc10a49bed173ade9c6c076241a448639fe50aa8"
SRCREV_meta_pn-linux-yocto_jasperforest ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"

3
meta-n450/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -1,6 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_n450 = "n450"
KMACHINE_n450 = "yocto/standard/common-pc/atom-pc"
KMACHINE_n450 = "atom-pc"
KBRANCH_n450 = "yocto/standard/common-pc/atom-pc"
# The n450 is a single core hypterthreaded CPU
KERNEL_FEATURES_append_n450 += " cfg/smp.scc"

3
meta-romley/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -1,7 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_romley = "romley"
KMACHINE_romley = "yocto/standard/common-pc-64/romley"
KMACHINE_romley = "romley"
KBRANCH_romley = "yocto/standard/common-pc-64/romley"
SRCREV_machine_pn-linux-yocto_romley ?= "d26ab3559d75d0a3946ecaef67d3aeb7e9e7ef22"
SRCREV_meta_pn-linux-yocto_romley ?= "67ce7623909cef63927fd145026aaf371cf4abf1"

3
meta-sugarbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
View File

@ -1,7 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_sugarbay = "sugarbay"
KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay"
KMACHINE_sugarbay = "sugarbay"
KBRANCH_sugarbay = "yocto/standard/common-pc-64/sugarbay"
SRCREV_machine_pn-linux-yocto_sugarbay ?= "162abf381df130fbf6ba8df353821fa684e59dfa"
SRCREV_meta_pn-linux-yocto_sugarbay ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"