From 8639a836d388812887ecd28bd4e7c66a7763ee8e Mon Sep 17 00:00:00 2001 From: Rahul Saxena Date: Wed, 2 May 2012 13:51:04 -0700 Subject: meta-cedartrail: add SRCREV of yocto/pvr kernel branch SRCREV for yocto/pvr was needed after the new rev of the kernel pvr patches were added Signed-off-by: Rahul Saxena Signed-off-by: Tom Zanussi --- .../recipes-kernel/linux/linux-yocto-rt_3.0.bbappend | 3 +-- meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend | 10 +++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend index 759c3b74..a1471689 100755 --- a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +++ b/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" - COMPATIBLE_MACHINE_cedartrail = "cedartrail" KMACHINE_cedartrail = "cedartrail" @@ -19,6 +17,7 @@ KERNEL_FEATURES_append_cedartrail += " bsp/cedartrail/cedartrail-pvr-merge.scc" #KBRANCH_cedartrail-nopvr = "yocto/standard/preempt-rt/base" #SRCREV_machine_pn-linux-yocto-rt_cedartrail-nopvr ?= XXXX #SRCREV_meta_pn-linux-yocto-rt_cedartrail-nopvr ?= XXXX +#SRCREV_pvr_pn-linux-yocto-rt_cedartrail ?= XXXX #KBRANCH_cedartrail = "yocto/standard/preempt-rt/base" #SRCREV_machine_pn-linux-yocto-rt_cedartrail ?= XXXX 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 03c5a275..fc6885a0 100755 --- a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend @@ -1,6 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" +SRC_URI_cedartrail = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta,yocto/pvr;name=machine,meta,pvr" + +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-nopvr = "cedartrail" KMACHINE_cedartrail-nopvr = "yocto/standard/cedartrail" @@ -12,8 +15,9 @@ 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" -SRCREV_machine_pn-linux-yocto_cedartrail ?= "5746120ee0afefd1e28400bea4b74f285bd5e59a" +SRCREV_machine_pn-linux-yocto_cedartrail ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94" SRCREV_meta_pn-linux-yocto_cedartrail ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c" +SRCREV_pvr_pn-linux-yocto_cedartrail ?= "997f5644664b31ebefd6e16c451c4a3729eb378a" -SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "5746120ee0afefd1e28400bea4b74f285bd5e59a" +SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94" SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c" -- cgit v1.2.3-54-g00ecf