Patchwork speex: fix FILES variables

login
register
mail settings
Submitter Eric BENARD
Date March 21, 2012, 11:08 a.m.
Message ID <1332328101-22779-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/23965/
State Accepted
Commit 4fc0f65e7d6e6fc6775a9a7e54510b629c9786d9
Headers show

Comments

Eric BENARD - March 21, 2012, 11:08 a.m.
actually FILES_${PN} and FILES_${PN}-dev match the same files.
these files are supposed to go into ${PN} so remove the other entry.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 meta/recipes-multimedia/speex/speex_1.2rc1.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Richard Purdie - March 21, 2012, 12:26 p.m.
On Wed, 2012-03-21 at 12:08 +0100, Eric Bénard wrote:
> actually FILES_${PN} and FILES_${PN}-dev match the same files.
> these files are supposed to go into ${PN} so remove the other entry.
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>  meta/recipes-multimedia/speex/speex_1.2rc1.bb |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> index fe46a00..7370134 100644
> --- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> +++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \
>                      file://include/speex/speex.h;beginline=1;endline=34;md5=a68129f78d7fe66e07163f73aba143b3"
>  DEPENDS = "libogg"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
>  
> @@ -24,5 +24,4 @@ EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
>  
>  PACKAGES += "${PN}-bin"
>  FILES_${PN} = "${libdir}/lib*.so.*"
> -FILES_${PN}-dev += "${libdir}/lib*.so.*"
>  FILES_${PN}-bin = "${bindir}"

Doesn't this mean -dev files are ending up in the main package?

Shouldn't this be:

FILES_${PN} = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-dev = "${libdir}/lib*${SOLIBSDEV}"

or better, remove these and add:

inherit lib_package

?

Cheers,

Richard
Eric BENARD - March 21, 2012, 12:56 p.m.
Le Wed, 21 Mar 2012 12:26:12 +0000,
Richard Purdie <richard.purdie@linuxfoundation.org> a écrit :

> On Wed, 2012-03-21 at 12:08 +0100, Eric Bénard wrote:
> > @@ -24,5 +24,4 @@ EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
> >  
> >  PACKAGES += "${PN}-bin"
> >  FILES_${PN} = "${libdir}/lib*.so.*"
> > -FILES_${PN}-dev += "${libdir}/lib*.so.*"
> >  FILES_${PN}-bin = "${bindir}"
> 
> Doesn't this mean -dev files are ending up in the main package?
> 
this seems to work fine as this (with no other layer than oe-core).

packages-split/speex
`-- usr
    `-- lib
        |-- libspeexdsp.so.1 -> libspeexdsp.so.1.5.0
        |-- libspeexdsp.so.1.5.0
        |-- libspeex.so.1 -> libspeex.so.1.5.0
        `-- libspeex.so.1.5.0

2 directories, 4 files

packages-split/speex-dev/
.../...
    |-- lib
    |   |-- libspeexdsp.la
    |   |-- libspeexdsp.so -> libspeexdsp.so.1.5.0
    |   |-- libspeex.la
    |   |-- libspeex.so -> libspeex.so.1.5.0
    |   `-- pkgconfig
    |       |-- speexdsp.pc
    |       `-- speex.pc
.../...

> Shouldn't this be:
> 
> FILES_${PN} = "${libdir}/lib*${SOLIBS}"
> FILES_${PN}-dev = "${libdir}/lib*${SOLIBSDEV}"
> 
> or better, remove these and add:
> 
> inherit lib_package
> 
> ?
> 
no clear idea on that, you are the boss to tell me which one you
prefer ;-)

Eric
Richard Purdie - March 21, 2012, 2:01 p.m.
On Wed, 2012-03-21 at 13:56 +0100, Eric Bénard wrote:
> Le Wed, 21 Mar 2012 12:26:12 +0000,
> Richard Purdie <richard.purdie@linuxfoundation.org> a écrit :
> 
> > On Wed, 2012-03-21 at 12:08 +0100, Eric Bénard wrote:
> > > @@ -24,5 +24,4 @@ EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
> > >  
> > >  PACKAGES += "${PN}-bin"
> > >  FILES_${PN} = "${libdir}/lib*.so.*"
> > > -FILES_${PN}-dev += "${libdir}/lib*.so.*"
> > >  FILES_${PN}-bin = "${bindir}"
> > 
> > Doesn't this mean -dev files are ending up in the main package?
> > 
> this seems to work fine as this (with no other layer than oe-core).
> 
> packages-split/speex
> `-- usr
>     `-- lib
>         |-- libspeexdsp.so.1 -> libspeexdsp.so.1.5.0
>         |-- libspeexdsp.so.1.5.0
>         |-- libspeex.so.1 -> libspeex.so.1.5.0
>         `-- libspeex.so.1.5.0
> 
> 2 directories, 4 files
> 
> packages-split/speex-dev/
> .../...
>     |-- lib
>     |   |-- libspeexdsp.la
>     |   |-- libspeexdsp.so -> libspeexdsp.so.1.5.0
>     |   |-- libspeex.la
>     |   |-- libspeex.so -> libspeex.so.1.5.0
>     |   `-- pkgconfig
>     |       |-- speexdsp.pc
>     |       `-- speex.pc
> .../...
> 
> > Shouldn't this be:
> > 
> > FILES_${PN} = "${libdir}/lib*${SOLIBS}"
> > FILES_${PN}-dev = "${libdir}/lib*${SOLIBSDEV}"
> > 
> > or better, remove these and add:
> > 
> > inherit lib_package
> > 
> > ?
> > 
> no clear idea on that, you are the boss to tell me which one you
> prefer ;-)

Well, I think "inherit lib_package" is going to be cleanest. Your
original patch is correct in its own right though, this just gives some
better cleanup :)

Cheers,

Richard
Saul Wold - April 3, 2012, 8:50 p.m.
On 03/21/2012 04:08 AM, Eric Bénard wrote:
> actually FILES_${PN} and FILES_${PN}-dev match the same files.
> these files are supposed to go into ${PN} so remove the other entry.
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
> ---
>   meta/recipes-multimedia/speex/speex_1.2rc1.bb |    3 +--
>   1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> index fe46a00..7370134 100644
> --- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> +++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \
>                       file://include/speex/speex.h;beginline=1;endline=34;md5=a68129f78d7fe66e07163f73aba143b3"
>   DEPENDS = "libogg"
>
> -PR = "r0"
> +PR = "r1"
>
>   SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
>
> @@ -24,5 +24,4 @@ EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
>
>   PACKAGES += "${PN}-bin"
>   FILES_${PN} = "${libdir}/lib*.so.*"
> -FILES_${PN}-dev += "${libdir}/lib*.so.*"
>   FILES_${PN}-bin = "${bindir}"

Merged into OE-Core

Thanks
	Sau!
Eric BENARD - April 4, 2012, 8:29 a.m.
Hi Saul,

Le Tue, 03 Apr 2012 13:50:37 -0700,
Saul Wold <sgw@linux.intel.com> a écrit :

> On 03/21/2012 04:08 AM, Eric Bénard wrote:
> > actually FILES_${PN} and FILES_${PN}-dev match the same files.
> > these files are supposed to go into ${PN} so remove the other entry.
> >
> > Signed-off-by: Eric Bénard<eric@eukrea.com>
> > ---
> >   meta/recipes-multimedia/speex/speex_1.2rc1.bb |    3 +--
> >   1 files changed, 1 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> > index fe46a00..7370134 100644
> > --- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> > +++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \
> >                       file://include/speex/speex.h;beginline=1;endline=34;md5=a68129f78d7fe66e07163f73aba143b3"
> >   DEPENDS = "libogg"
> >
> > -PR = "r0"
> > +PR = "r1"
> >
> >   SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
> >
> > @@ -24,5 +24,4 @@ EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
> >
> >   PACKAGES += "${PN}-bin"
> >   FILES_${PN} = "${libdir}/lib*.so.*"
> > -FILES_${PN}-dev += "${libdir}/lib*.so.*"
> >   FILES_${PN}-bin = "${bindir}"
> 
> Merged into OE-Core
> 
it was already applied as 4fc0f65e7d6e6fc6775a9a7e54510b629c9786d9

Eric
Paul Eggleton - April 4, 2012, 8:41 a.m.
On Wednesday 04 April 2012 10:29:01 Eric Bénard wrote:
> Hi Saul,
> 
> Le Tue, 03 Apr 2012 13:50:37 -0700,
> 
> Saul Wold <sgw@linux.intel.com> a écrit :
> > On 03/21/2012 04:08 AM, Eric Bénard wrote:
> > > actually FILES_${PN} and FILES_${PN}-dev match the same files.
> > > these files are supposed to go into ${PN} so remove the other entry.
> > > 
> > > Signed-off-by: Eric Bénard<eric@eukrea.com>
> > > ---
> > > 
> > >   meta/recipes-multimedia/speex/speex_1.2rc1.bb |    3 +--
> > >   1 files changed, 1 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> > > b/meta/recipes-multimedia/speex/speex_1.2rc1.bb index fe46a00..7370134
> > > 100644
> > > --- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> > > +++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
> > > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
> > > "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \> > 
> > >                       file://include/speex/speex.h;beginline=1;endline=3
> > >                       4;md5=a68129f78d7fe66e07163f73aba143b3"> >   
> > >   DEPENDS = "libogg"
> > > 
> > > -PR = "r0"
> > > +PR = "r1"
> > > 
> > >   SRC_URI =
> > >   "http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
> > > 
> > > @@ -24,5 +24,4 @@ EXTRA_OECONF = " --enable-fixed-point
> > > --with-ogg-libraries=${STAGING_LIBDIR} \> > 
> > >   PACKAGES += "${PN}-bin"
> > >   FILES_${PN} = "${libdir}/lib*.so.*"
> > > 
> > > -FILES_${PN}-dev += "${libdir}/lib*.so.*"
> > > 
> > >   FILES_${PN}-bin = "${bindir}"
> > 
> > Merged into OE-Core
> 
> it was already applied as 4fc0f65e7d6e6fc6775a9a7e54510b629c9786d9

Saul's just catching up on the merge replies, so he's referring to that 
commit.

Cheers,
Paul

Patch

diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
index fe46a00..7370134 100644
--- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
+++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
@@ -7,7 +7,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \
                     file://include/speex/speex.h;beginline=1;endline=34;md5=a68129f78d7fe66e07163f73aba143b3"
 DEPENDS = "libogg"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
 
@@ -24,5 +24,4 @@  EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
 
 PACKAGES += "${PN}-bin"
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/lib*.so.*"
 FILES_${PN}-bin = "${bindir}"