glibc/eglibc: remove calls to obsolete base_set_filespath()

Some recipes can use the default FILESPATHPKG, others need to override.

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

diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc
index 5fbb5dbda555ad2adf930d1405adffd71a566104..7a5a7b22f487e31f6ea5253fa016d939fc5e7320 100644 (file)
--- a/recipes/eglibc/eglibc-initial.inc
+++ b/recipes/eglibc/eglibc-initial.inc
@@ -1,7 +1,6 @@
 SECTION = "libs"
 DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
 PACKAGES_DYNAMIC = ""

diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
index 5528cf8edb3aaa869322c4cef777f605ae70e2bf..cd659240479720e3f8218a1e1da88201ab26b047 100644 (file)
--- a/recipes/glibc/glibc-initial.inc
+++ b/recipes/glibc/glibc-initial.inc
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "glibc-2.4:"
 
 PACKAGES = ""
 PACKAGES_DYNAMIC = ""

diff --git a/recipes/glibc/glibc-initial_2.2.5.bb b/recipes/glibc/glibc-initial_2.2.5.bb
index 84412bd596583851136372de4bdaf9aa7016fdd4..c7dde2310e18d9de89586576d9b833fee4989f31 100644 (file)
--- a/recipes/glibc/glibc-initial_2.2.5.bb
+++ b/recipes/glibc/glibc-initial_2.2.5.bb
@@ -2,4 +2,3 @@ require glibc_${PV}.bb
 require glibc-initial.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

diff --git a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
index 4d7129b7b80f8fd1d4274a478e4f2bf0105dac45..c7dde2310e18d9de89586576d9b833fee4989f31 100644 (file)
--- a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
+++ b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
@@ -2,4 +2,3 @@ require glibc_${PV}.bb
 require glibc-initial.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

diff --git a/recipes/glibc/glibc-initial_2.3.2.bb b/recipes/glibc/glibc-initial_2.3.2.bb
index 84412bd596583851136372de4bdaf9aa7016fdd4..c7dde2310e18d9de89586576d9b833fee4989f31 100644 (file)
--- a/recipes/glibc/glibc-initial_2.3.2.bb
+++ b/recipes/glibc/glibc-initial_2.3.2.bb
@@ -2,4 +2,3 @@ require glibc_${PV}.bb
 require glibc-initial.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

diff --git a/recipes/glibc/glibc-initial_2.3.6.bb b/recipes/glibc/glibc-initial_2.3.6.bb
index 8249cd696d0a962754c0d559003200776bf984b3..fa7836ad88a49e49a292dc34c290f6916d8c6309 100644 (file)
--- a/recipes/glibc/glibc-initial_2.3.6.bb
+++ b/recipes/glibc/glibc-initial_2.3.6.bb
@@ -1,4 +1,2 @@
 require glibc_${PV}.bb
 require glibc-initial.inc
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

diff --git a/recipes/glibc/glibc-initial_cvs.bb b/recipes/glibc/glibc-initial_cvs.bb
index 81be5fc49b6aa1f6258a595ca86f46533c3ecf65..0bfd665a598b2c058d3843584a43a32712940a10 100644 (file)
--- a/recipes/glibc/glibc-initial_cvs.bb
+++ b/recipes/glibc/glibc-initial_cvs.bb
@@ -1,4 +1,5 @@
 require glibc_${PV}.bb
 require glibc-initial.inc
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+# glibc_cvs.bb overrides PV; glibc-cvs won't automatically be in FILESPATHPKG
+FILESPATHPKG =. "glibc-cvs:"

diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb
index ab167daaa8c3fc03c770f2b79ad4839b0bd43036..8d645409dd50d90fd85d41ed5f6cc75c44446aa6 100644 (file)
--- a/recipes/glibc/glibc_2.3.6.bb
+++ b/recipes/glibc/glibc_2.3.6.bb
@@ -2,8 +2,6 @@ require glibc.inc
 
 PR = "r5"
 
-#FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
-
 GLIBC_ADDONS ?= "linuxthreads"
 
 #           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;patch=1

diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb
index 8ae84c1c7efec90f7ccbe1a881735944e5b4ccf9..1a2902d646645ee1f89bac101d57c17313a98046 100644 (file)
--- a/recipes/glibc/glibc_2.7.bb
+++ b/recipes/glibc/glibc_2.7.bb
@@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "glibc-2.4:"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 

diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index 7859876cb0ed29e5b551924a9aeb078128dbff34..7709d26f660af151503f130beb85f5519de38c97 100644 (file)
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "glibc-2.4:"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"