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 ++++-- meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend | 6 ++++-- meta-emenlow/recipes-kernel/linux/linux-yocto_3.0.bbappend | 3 ++- meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend | 3 ++- meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend | 3 ++- meta-n450/recipes-kernel/linux/linux-yocto_3.0.bbappend | 3 ++- meta-romley/recipes-kernel/linux/linux-yocto_3.0.bbappend | 3 ++- meta-sugarbay/recipes-kernel/linux/linux-yocto_3.0.bbappend | 3 ++- 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 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" 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 @@ 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" 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 @@ 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" 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 @@ 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" 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}:" 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" 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 @@ 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" 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 @@ 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" 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 @@ 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" -- cgit v1.2.3-54-g00ecf