From 90ace178d3fb5d253cdba396bce66dd2fce2ed79 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Thu, 12 May 2011 15:37:09 -0700 Subject: linux-yocto*: extend FILESEXTRAPATHS instead of clobber them Clobbering FILESEXTRAPATHS prevents multiple bbappend files providing file:// SRC_URIs. Extend the variable in each meta-* layer instead. Build tested with linux-yocto on n450 and crownbay and linux-yocto-stable on crownbay. Build tested linux-yocto on n450 with a third layer adding a config fragment. Signed-off-by: Darren Hart Acked-by: Tom Zanussi --- meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 4136536f..83094789 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_crownbay = "crownbay" KMACHINE_crownbay = "crownbay" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend index 32bbd107..5912fb7c 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_crownbay = "crownbay" KMACHINE_crownbay = "yocto/standard/crownbay" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 9fa2937d..09234dcd 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_emenlow = "emenlow" KMACHINE_emenlow = "emenlow" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend index 360c2596..3d7e021d 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_emenlow = "emenlow" KMACHINE_emenlow = "yocto/standard/emenlow" diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend index 549d0857..2e122219 100644 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_fishriver = "fishriver" # zzzz /yocto/standard/crownbay->fishriver KMACHINE_fishriver = "yocto/standard/crownbay" diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 066776b3..a6e31d0b 100644 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_jasperforest = "jasperforest" KMACHINE_jasperforest = "jasperforest" diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend index 988c9694..57813268 100644 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_jasperforest = "jasperforest" diff --git a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend index e69c644b..73a3ee37 100644 --- a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" KMACHINE_n450 = "atom-pc" COMPATIBLE_MACHINE_n450 = "n450" diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend index 79706d54..92d666f1 100644 --- a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" KMACHINE_n450 = "yocto/standard/common-pc/atom-pc" COMPATIBLE_MACHINE_n450 = "n450" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend index fe160c06..c1b9a9ed 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" +FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" COMPATIBLE_MACHINE_sugarbay = "sugarbay" KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" -- cgit v1.2.3-54-g00ecf