Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes.

Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Tom Rini <trini@embeddedalley.com>

diff --git a/recipes/cherokee/cherokee-nossl_0.5.3.bb b/recipes/cherokee/cherokee-nossl_0.5.3.bb
index 409366004afbd97f2d046eef5f9050740079e69d..3ea9068456a7cb975b47c8aae5fc2a60772dbd35 100644 (file)
--- 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 f5f6c0bc2d6e7b7b3c8a77dd6b33a2702bd4912c..a6439ee6535dcf25204bda7f2e3b40bd14b835fc 100644 (file)
--- 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 e787eede9237fa1e6563e1b7be93c54f6f1ef08b..aa20e29644200609df62e88a91b83262507bc87d 100644 (file)
--- 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 5520896a5a2db703476322c50ee7aeeaa122fdf6..8261ef55dc5dbd3a1f76c8d11b09eab91260a0c1 100644 (file)
--- 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 78a0c54f9d2ae80e9994a4a0facff78312914823..a073e656a794bb828ca4d4741fce8cbe6528c860 100644 (file)
--- 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 \