From b78152acaf5ae9a45f7c749291bf276f60707832 Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@cbnco.com>
Date: Mon, 25 May 2009 20:34:53 +0000
Subject: Remove references to base_set_filespath() from recipes that don't
 need it.

These recipes are covered by the default FILESPATHPKG setting.

Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Tom Rini <trini@embeddedalley.com>
---
 recipes/db/db3-native_3.2.9.bb                         | 1 -
 recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb   | 1 -
 recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb | 1 -
 recipes/e2fsprogs/e2fsprogs-native_1.38.bb             | 1 -
 recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb           | 1 -
 recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb           | 1 -
 recipes/e2tools/e2tools-native_0.0.16.bb               | 1 -
 recipes/genext2fs/genext2fs-native_1.3.bb              | 1 -
 recipes/mysql/mysql_4.1.22.bb                          | 2 --
 recipes/recode/recode_3.6.bb                           | 7 ++-----
 recipes/slugimage/slugimage-native.bb                  | 2 --
 recipes/slugtool/slugtool-native.bb                    | 1 -
 recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb  | 2 --
 recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb  | 1 -
 recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb  | 1 -
 recipes/squashfs-tools/squashfs-tools-native_3.3.bb    | 1 -
 recipes/squashfs-tools/squashfs-tools-native_4.0.bb    | 1 -
 17 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/recipes/db/db3-native_3.2.9.bb b/recipes/db/db3-native_3.2.9.bb
index 492f7407d1..f16b19f642 100644
--- a/recipes/db/db3-native_3.2.9.bb
+++ b/recipes/db/db3-native_3.2.9.bb
@@ -4,5 +4,4 @@ CONFLICTS = "db-native"
 inherit native
 require db3_${PV}.bb
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/db3-${PV}', '${FILE_DIRNAME}/db3', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
index 9d0afa864b..5f94c08dd4 100644
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
@@ -2,5 +2,4 @@ SECTION = "base"
 require e2fsprogs-libs_${PV}.bb
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
index 3db9e02f28..2632db485d 100644
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
@@ -2,7 +2,6 @@ SECTION = "base"
 require e2fsprogs-libs_${PV}.bb
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 DEPENDS = "gettext-native"
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
index af49b0d7dd..13fd2beb0c 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -11,7 +11,6 @@ SRC_URI += "file://no-hardlinks.patch;patch=1 \
 
 EXTRA_OECONF = ""
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 DEPENDS = ""
 
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
index e79958cb2f..4ff399b10f 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF = ""
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 DEPENDS = ""
 
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
index b29064f5c8..295136328e 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
@@ -6,7 +6,6 @@ SRC_URI += "file://mkinstalldirs.patch;patch=1"
 
 EXTRA_OECONF = ""
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 DEPENDS = ""
 
diff --git a/recipes/e2tools/e2tools-native_0.0.16.bb b/recipes/e2tools/e2tools-native_0.0.16.bb
index e37eed2b18..f23a0b12a2 100644
--- a/recipes/e2tools/e2tools-native_0.0.16.bb
+++ b/recipes/e2tools/e2tools-native_0.0.16.bb
@@ -3,7 +3,6 @@ require e2tools_${PV}.bb
 inherit native
 
 DEPENDS = "e2fsprogs-libs-native e2fsprogs-native"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2tools-${PV}', '${FILE_DIRNAME}/e2tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 e2links = "e2ln e2ls e2mkdir e2mv e2rm e2tail"
diff --git a/recipes/genext2fs/genext2fs-native_1.3.bb b/recipes/genext2fs/genext2fs-native_1.3.bb
index 2e26fa0110..50b371b97e 100644
--- a/recipes/genext2fs/genext2fs-native_1.3.bb
+++ b/recipes/genext2fs/genext2fs-native_1.3.bb
@@ -1,6 +1,5 @@
 require genext2fs_${PV}.bb
 inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 do_stage () {
 	install -m 0755 genext2fs ${STAGING_BINDIR}/
diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
index 7f32b4ddee..09c52ecbc2 100644
--- a/recipes/mysql/mysql_4.1.22.bb
+++ b/recipes/mysql/mysql_4.1.22.bb
@@ -14,8 +14,6 @@ SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
 
 S = "${WORKDIR}/mysql-${PV}"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
 BINCONFIG_GLOB = "mysql_config"
 
 inherit autotools binconfig update-rc.d
diff --git a/recipes/recode/recode_3.6.bb b/recipes/recode/recode_3.6.bb
index 6fd60ae399..37e3b2a8aa 100644
--- a/recipes/recode/recode_3.6.bb
+++ b/recipes/recode/recode_3.6.bb
@@ -3,11 +3,8 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 
 PR = "r1"
-SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/recode-${PV}', '${FILE_DIRNAME}' ], d)}"
-
-SRC_URI += "file://recode-bitfield-width.patch;patch=1 \
-            "
+SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz \
+	file://recode-bitfield-width.patch;patch=1"
 
 inherit autotools
 
diff --git a/recipes/slugimage/slugimage-native.bb b/recipes/slugimage/slugimage-native.bb
index 8b60ff1b59..f8408a150a 100644
--- a/recipes/slugimage/slugimage-native.bb
+++ b/recipes/slugimage/slugimage-native.bb
@@ -6,8 +6,6 @@ RDEPENDS = ""
 
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
 do_stage () {
 	install -m 0755 slugimage ${STAGING_BINDIR}/
 }
diff --git a/recipes/slugtool/slugtool-native.bb b/recipes/slugtool/slugtool-native.bb
index 2d1fe918de..088839cf80 100644
--- a/recipes/slugtool/slugtool-native.bb
+++ b/recipes/slugtool/slugtool-native.bb
@@ -2,7 +2,6 @@ SECTION = "unknown"
 require slugtool.bb
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugtool-${PV}', '${FILE_DIRNAME}/slugtool', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
index 2423e47e77..9ba56844fd 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
@@ -1,11 +1,9 @@
 require squashfs-tools_${PV}.bb
 
 DEPENDS = "lzma-native"
-PN_BASE = "squashfs-tools"
 
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN_BASE}-${PV}', '${FILE_DIRNAME}/${PN_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
index b6ee6e7a22..9ba56844fd 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
@@ -4,7 +4,6 @@ DEPENDS = "lzma-native"
 
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
index c35d183a08..c171e43f46 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
@@ -2,7 +2,6 @@ require squashfs-tools_${PV}.bb
 
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
index 87ba761ce4..5858bb18d6 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
@@ -3,7 +3,6 @@ PR = "r0"
 
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
index 87ba761ce4..5858bb18d6 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
@@ -3,7 +3,6 @@ PR = "r0"
 
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 do_stage () {
-- 
cgit v1.2.3