diff options
author | Michael Smith <msmith@cbnco.com> | 2009-10-07 06:10:18 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-10-28 11:21:57 +0100 |
commit | a96afb136320e881de926bd375653dc19025ba57 (patch) | |
tree | 8bede86c3530bf5740caea30e3bbef46d8c9e6ca | |
parent | 6222a3913320dab8e61628032e63da5fd9b6553d (diff) | |
download | openembedded-a96afb136320e881de926bd375653dc19025ba57.tar.gz |
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>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes/eglibc/eglibc-initial.inc | 1 | ||||
-rw-r--r-- | recipes/glibc/glibc-initial.inc | 2 | ||||
-rw-r--r-- | recipes/glibc/glibc-initial_2.2.5.bb | 1 | ||||
-rw-r--r-- | recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb | 1 | ||||
-rw-r--r-- | recipes/glibc/glibc-initial_2.3.2.bb | 1 | ||||
-rw-r--r-- | recipes/glibc/glibc-initial_2.3.6.bb | 2 | ||||
-rw-r--r-- | recipes/glibc/glibc-initial_cvs.bb | 3 | ||||
-rw-r--r-- | recipes/glibc/glibc_2.3.6.bb | 2 | ||||
-rw-r--r-- | recipes/glibc/glibc_2.7.bb | 2 |
9 files changed, 4 insertions, 11 deletions
diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc index 5fbb5dbda5..7a5a7b22f4 100644 --- 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 5528cf8edb..cd65924047 100644 --- 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 a2e656035e..a70385214d 100644 --- a/recipes/glibc/glibc-initial_2.2.5.bb +++ b/recipes/glibc/glibc-initial_2.2.5.bb @@ -2,6 +2,5 @@ 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)}" PROVIDES_unslung = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb index 4d7129b7b8..c7dde2310e 100644 --- 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 84412bd596..c7dde2310e 100644 --- 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 8249cd696d..fa7836ad88 100644 --- 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 81be5fc49b..0bfd665a59 100644 --- 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 ab167daaa8..8d645409dd 100644 --- 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 ec4b347713..d097cb968b 100644 --- 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" |