[poky] [PATCH 1/1] *.bbappend: don't expand FILESEXTRAPATHS immediately

[Richard Purdie]

On Wed, 2010-11-24 at 12:27 +0800, Kevin Tian wrote:
> There's no point to expand FILESEXTRAPATHS immediately, since the place where
> it's referenced still use normal getVar(FILESEXTRAPATHS, d, True). This way
> it doesn't help anything except adding one more breaking variable on sstate.

There is a very significant reason for doing immediate expansion with
these variables.

The := ensures that the expansion happens in the context of the current
file. Look at the value of

bitbake formfactor -e | grep ^FILESEXTRAPATH

before and after this patch and you'll see what I mean. It ensures the
directory containing the bbappend is searched for source files as well
as the directory containing the .bb file.

Cheers,

Richard



> Signed-off-by: Kevin Tian <kevin.tian at intel.com>
> ---
>  documentation/bsp-guide/bsp.xml                    |    2 +-
>  .../recipes/formfactor/formfactor_0.0.bbappend     |    2 +-
>  .../recipes/linux/linux-yocto_git.bbappend         |    2 +-
>  meta-emenlow/recipes/linux/linux_2.6.33.2.bbappend |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
> index 9e25068..0d716a3 100644
> --- a/documentation/bsp-guide/bsp.xml
> +++ b/documentation/bsp-guide/bsp.xml
> @@ -307,7 +307,7 @@ meta-bsp/packages/image-creator/image-creator-native_0.1.bb
>                  The example below shows extra files contained in a folder called ${PN} (the package name).
>              </para>
>              <programlisting>
> -FILESEXTRAPATHS := "${THISDIR}/${PN}"
> +FILESEXTRAPATHS = "${THISDIR}/${PN}"
>              </programlisting>
>              <para>
>              This technique allows the BSP to add machine-specific configuration files to the layer directory, 
> diff --git a/meta-emenlow/recipes/formfactor/formfactor_0.0.bbappend b/meta-emenlow/recipes/formfactor/formfactor_0.0.bbappend
> index 4a41d48..a64f367 100644
> --- a/meta-emenlow/recipes/formfactor/formfactor_0.0.bbappend
> +++ b/meta-emenlow/recipes/formfactor/formfactor_0.0.bbappend
> @@ -1,3 +1,3 @@
> -FILESEXTRAPATHS := "${THISDIR}/${PN}"
> +FILESEXTRAPATHS = "${THISDIR}/${PN}"
>   
>  PRINC = "1"
> diff --git a/meta-emenlow/recipes/linux/linux-yocto_git.bbappend b/meta-emenlow/recipes/linux/linux-yocto_git.bbappend
> index 9fa2937..77c5223 100644
> --- a/meta-emenlow/recipes/linux/linux-yocto_git.bbappend
> +++ b/meta-emenlow/recipes/linux/linux-yocto_git.bbappend
> @@ -1,3 +1,3 @@
> -FILESEXTRAPATHS := "${THISDIR}/${PN}"
> +FILESEXTRAPATHS = "${THISDIR}/${PN}"
>  COMPATIBLE_MACHINE_emenlow = "emenlow"
>  KMACHINE_emenlow  = "emenlow"
> diff --git a/meta-emenlow/recipes/linux/linux_2.6.33.2.bbappend b/meta-emenlow/recipes/linux/linux_2.6.33.2.bbappend
> index fac0921..c6f81d4 100644
> --- a/meta-emenlow/recipes/linux/linux_2.6.33.2.bbappend
> +++ b/meta-emenlow/recipes/linux/linux_2.6.33.2.bbappend
> @@ -1,3 +1,3 @@
> -FILESPATH := "${FILESPATH}:${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
> +FILESEXTRAPATH = "${THISDIR}/${PN}"
>  SRC_URI += "file://defconfig"
>  COMPATIBLE_MACHINE_emenlow = "emenlow"