[yocto] [PATCH] linux-yocto*: extend FILESEXTRAPATHS instead of clobber them

[Darren Hart]

scratch that, my devel machine and I didn't agree on what git pull
meant. This is already upstream.

--
Darren

On 05/24/2011 03:49 PM, Darren Hart wrote:
> Clobbering FILESEXTRAPATHS prevents multiple bbappends providing file://
> SRC_URIs. Extend the variable in each meta-* layer instead.
> 
> Signed-off-by: Darren Hart <dvhart at linux.intel.com>
> CC: Tom Zanussi <tom.zanussi at intel.com>
> ---
>  .../linux/linux-yocto-stable_git.bbappend          |    2 +-
>  .../recipes-kernel/linux/linux-yocto_git.bbappend  |    2 +-
>  .../linux/linux-yocto-stable_git.bbappend          |    2 +-
>  .../recipes-kernel/linux/linux-yocto_git.bbappend  |    2 +-
>  .../recipes-kernel/linux/linux-yocto_git.bbappend  |    2 +-
>  .../linux/linux-yocto-stable_git.bbappend          |    2 +-
>  .../recipes-kernel/linux/linux-yocto_git.bbappend  |    2 +-
>  .../linux/linux-yocto-stable_git.bbappend          |    2 +-
>  .../recipes-kernel/linux/linux-yocto_git.bbappend  |    2 +-
>  .../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 4136536..8309478 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 32bbd10..5912fb7 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 9fa2937..09234dc 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 360c259..3d7e021 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 549d085..2e12221 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 066776b..a6e31d0 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 988c969..5781326 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 e69c644..73a3ee3 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 79706d5..92d666f 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 fe160c0..c1b9a9e 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"

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel