[oe] [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes.

[Tom Rini]

On Tue, May 26, 2009 at 02:34:54AM -0400, Michael Smith wrote:

> Signed-off-by: Michael Smith <msmith at cbnco.com>

Acked-by: Tom Rini <trini at embeddedalley.com>

> ---
> 
> Of these, the following were build tested:
> 
>  recipes/cherokee/cherokee-nossl_0.5.3.bb           |    2 +-
>  .../squashfs-lzma-tools-native_3.1r2.bb            |    2 +-
> 
> 
> The rest were not:
> 
>  recipes/freesmartphone/frameworkd-devel_git.bb     |    2 +-
>  recipes/initscripts/initscripts-openprotium_1.0.bb |    2 +-
>  recipes/vim/gvim_7.0.bb                            |    2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/recipes/cherokee/cherokee-nossl_0.5.3.bb b/recipes/cherokee/cherokee-nossl_0.5.3.bb
> index 4093660..3ea9068 100644
> --- a/recipes/cherokee/cherokee-nossl_0.5.3.bb
> +++ b/recipes/cherokee/cherokee-nossl_0.5.3.bb
> @@ -2,7 +2,7 @@ require cherokee_${PV}.bb
>  
>  DEPENDS = "libpcre"
>  
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_DIRNAME}/cherokee', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "cherokee-${PV}:cherokee:"
>  
>  S = "${WORKDIR}/cherokee-${PV}"
>  
> diff --git a/recipes/freesmartphone/frameworkd-devel_git.bb b/recipes/freesmartphone/frameworkd-devel_git.bb
> index f5f6c0b..a6439ee 100644
> --- a/recipes/freesmartphone/frameworkd-devel_git.bb
> +++ b/recipes/freesmartphone/frameworkd-devel_git.bb
> @@ -1,5 +1,5 @@
>  require frameworkd_git.bb
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "frameworkd:"
>  PROVIDES = "frameworkd"
>  RPROVIDES = "frameworkd"
>  PV = "0.8.5.x+gitr${SRCREV}"
> diff --git a/recipes/initscripts/initscripts-openprotium_1.0.bb b/recipes/initscripts/initscripts-openprotium_1.0.bb
> index e787eed..aa20e29 100644
> --- a/recipes/initscripts/initscripts-openprotium_1.0.bb
> +++ b/recipes/initscripts/initscripts-openprotium_1.0.bb
> @@ -13,7 +13,7 @@ RCONFLICTS = "initscripts"
>  # a suffix
>  PR := "${PR}.11"
>  
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "${P}:initscripts-${PV}:"
>  
>  PACKAGES = "${PN}-dbg ${PN}"
>  
> diff --git a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
> index 5520896..8261ef5 100644
> --- a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
> +++ b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
> @@ -4,7 +4,7 @@ DEPENDS = "lzma-native"
>  
>  inherit native
>  
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "squashfs-tools-${PV}:squashfs-tools:"
>  PACKAGES = ""
>  
>  do_stage () {
> diff --git a/recipes/vim/gvim_7.0.bb b/recipes/vim/gvim_7.0.bb
> index 78a0c54..a073e65 100644
> --- a/recipes/vim/gvim_7.0.bb
> +++ b/recipes/vim/gvim_7.0.bb
> @@ -4,7 +4,7 @@ require vim.inc
>  
>  DEPENDS += "gtk+ xt"
>  PR = "r1"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "vim-${PV}:vim:"
>  
>  EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \
>  		--disable-xim --with-features=big \
> -- 
> 1.5.6.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 

-- 
Tom Rini