Received: from [71.6.201.124] (helo=easi.embeddedalley.com) by linuxtogo.org with smtp (Exim 4.69) (envelope-from ) id 1MARm6-0001Py-CU for openembedded-devel@openembedded.org; Sat, 30 May 2009 18:51:14 +0200 Received: (qmail 27440 invoked from network); 30 May 2009 16:42:41 -0000 Received: from easi.embeddedalley.com (HELO localhost) (easi@71.6.201.124) by easi.embeddedalley.com with SMTP; 30 May 2009 09:42:41 -0700 Date: Sat, 30 May 2009 09:42:40 -0700 From: Tom Rini To: openembedded-devel@lists.openembedded.org Message-ID: <20090530164240.GF23842@smtp.west.cox.net> References: <1243319696-16223-1-git-send-email-msmith@cbnco.com> <1243319696-16223-2-git-send-email-msmith@cbnco.com> <1243319696-16223-3-git-send-email-msmith@cbnco.com> MIME-Version: 1.0 In-Reply-To: <1243319696-16223-3-git-send-email-msmith@cbnco.com> Organization: Embedded Alley Solutions, Inc User-Agent: Mutt/1.5.18 (2008-05-17) Subject: Re: [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath() X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:51:15 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 26, 2009 at 02:34:55AM -0400, Michael Smith wrote: > Some recipes can use the default FILESPATHPKG, others need to override. > > Signed-off-by: Michael Smith Acked-by: Tom Rini > --- > > Of these, the following were build tested: > recipes/glibc/glibc-initial.inc | 2 +- > (for glibc 2.6.1) > > The rest were not. > > I think something might be dicey here: glibc-2.4 was being prepended > to the FILESPATH in many recipes, including glibc-initial.inc (and still > is -- I just converted it to FILESPATHPKG). It's at the start of the > path, so for example glibc-2.4/blah.patch would override > glibc-2.999/blah.patch for glibc-initial_2.999. > > So far there are no duplicate files between glibc-2.4 and the higher > versions, so it hasn't bitten anybody yet. > > 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 +- > recipes/glibc/glibc_2.9.bb | 2 +- > 10 files changed, 5 insertions(+), 12 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 84412bd..c7dde23 100644 > --- 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 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 8ae84c1..1a2902d 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" > > diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb > index 7859876..7709d26 100644 > --- 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" > > -- > 1.5.6.5 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > -- Tom Rini