[oe] [STABLE][PATCH 039/125] glibc/eglibc: remove calls to obsolete base_set_filespath()
Denys Dmytriyenko
denis at denix.org
Wed Jul 1 19:26:07 UTC 2009
On Wed, Jul 01, 2009 at 08:54:54PM +0200, Marcin Juszkiewicz wrote:
> From: Michael Smith <msmith at cbnco.com>
>
> Some recipes can use the default FILESPATHPKG, others need to override.
>
> Signed-off-by: Michael Smith <msmith at cbnco.com>
> Acked-by: Tom Rini <trini at embeddedalley.com>
> Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
Acked-by: Denys Dmytriyenko <denis at denix.org>
> ---
> recipes/eglibc/eglibc-initial.inc | 1 -
> recipes/glibc/glibc-initial.inc | 2 +-
> recipes/glibc/glibc-initial_2.2.5.bb | 1 -
> recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb | 1 -
> recipes/glibc/glibc-initial_2.3.2.bb | 1 -
> recipes/glibc/glibc-initial_2.3.6.bb | 2 --
> recipes/glibc/glibc-initial_cvs.bb | 3 ++-
> recipes/glibc/glibc_2.3.6.bb | 2 --
> 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 5fbb5db..7a5a7b2 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 5528cf8..cd65924 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 a2e6560..a703852 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 4d7129b..c7dde23 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 84412bd..c7dde23 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 8249cd6..fa7836a 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 81be5fc..0bfd665 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 ab167da..8d64540 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 ec4b347..d097cb9 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"
>
> --
> 1.6.3.1
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
More information about the Openembedded-devel
mailing list