[PATCH 0/7] Simplify lib_package

[PATCH 0/7] Simplify lib_package

[Saul Wold]

This series continues the PACKAGES changes and takes
advanatage of having a ${PN}-bin, by adding a
PACKGE_BEFORE_PN in the PACKAGES list.

Update other recipes that had defined ${PN}-bin.

I verified these changes did not affect any packages directly
with buildhistory, which can be seen at poky-contrib/sgw/libhistory

Sau!


The following changes since commit 3347ea9e300514d07315a8a044b9b3be206a30ea:

  upstream_tracking: update boost (2012-06-29 14:07:59 -0700)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib sgw/lib_package
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/lib_package

Saul Wold (7):
  bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
  lib_package: use PACKAGE_BEFORE_PN
  libacpi: use lib_package bbclass
  pulseaudio: use lib_package bbclass
  db: use lib_package bbclass
  gnutls: use lib_package bbclass
  speex: use lib_package bbclass

 meta/classes/lib_package.bbclass                     |    3 +--
 meta/conf/bitbake.conf                               |    3 ++-
 meta/recipes-bsp/libacpi/libacpi_0.2.bb              |    7 ++-----
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc    |    3 +--
 meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb |    2 +-
 meta/recipes-multimedia/speex/speex_1.2rc1.bb        |    8 ++------
 meta/recipes-support/db/db_5.3.15.bb                 |    4 +---
 meta/recipes-support/gnutls/gnutls.inc               |   14 +++-----------
 8 files changed, 13 insertions(+), 31 deletions(-)

-- 
1.7.10.4

[PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES

[Saul Wold]

By doing this we can easily add addtional packages that can be
greedy before PN, but after some of the other standard packages.

This will also allow us to simplify the lib_package class to set
this variable.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/bitbake.conf |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9377ee6..df4907e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -254,7 +254,8 @@ SOLIBSDEV_darwin = ".dylib"
 SOLIBSDEV_darwin8 = ".dylib"
 SOLIBSDEV_darwin9 = ".dylib"
 
-PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PN}"
+PACKAGE_BEFORE_PN ?= ""
+PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
 PACKAGES_DYNAMIC = "${PN}-locale-*"
 FILES = ""
 
-- 
1.7.10.4

Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]

On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com> wrote:
> By doing this we can easily add addtional packages that can be
> greedy before PN, but after some of the other standard packages.
>
> This will also allow us to simplify the lib_package class to set
> this variable.
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/conf/bitbake.conf |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 9377ee6..df4907e 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -254,7 +254,8 @@ SOLIBSDEV_darwin = ".dylib"
>  SOLIBSDEV_darwin8 = ".dylib"
>  SOLIBSDEV_darwin9 = ".dylib"
>
> -PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PN}"
> +PACKAGE_BEFORE_PN ?= ""
> +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PACKAGE_BEFORE_PN} ${PN}"
>  PACKAGES_DYNAMIC = "${PN}-locale-*"
>  FILES = ""
>


Can it appear at the beginning before pn-dbg?
Then you could just prepend I don't think any of those predefined packages
will have anything of interest that's in pn-bin
> --
> 1.7.10.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 1933 bytes --]

Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES

[Saul Wold]

On 06/29/2012 02:52 PM, Khem Raj wrote:
>
>
> On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>> wrote:
>  > By doing this we can easily add addtional packages that can be
>  > greedy before PN, but after some of the other standard packages.
>  >
>  > This will also allow us to simplify the lib_package class to set
>  > this variable.
>  >
>  > Signed-off-by: Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>>
>  > ---
>  >  meta/conf/bitbake.conf |    3 ++-
>  >  1 file changed, 2 insertions(+), 1 deletion(-)
>  >
>  > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>  > index 9377ee6..df4907e 100644
>  > --- a/meta/conf/bitbake.conf
>  > +++ b/meta/conf/bitbake.conf
>  > @@ -254,7 +254,8 @@ SOLIBSDEV_darwin = ".dylib"
>  >  SOLIBSDEV_darwin8 = ".dylib"
>  >  SOLIBSDEV_darwin9 = ".dylib"
>  >
>  > -PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
> ${PN}-locale ${PN}"
>  > +PACKAGE_BEFORE_PN ?= ""
>  > +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
> ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
>  >  PACKAGES_DYNAMIC = "${PN}-locale-*"
>  >  FILES = ""
>  >
>
>
> Can it appear at the beginning before pn-dbg?
> Then you could just prepend I don't think any of those predefined
> packages will have anything of interest that's in pn-bin

No that's won't work since pn-dev wants to get -config binaries and 
sometimes there are other binaries that pn-dev wants, I did try that 
initially, by having -bin in front with =+ and got failures.

This has been a tricky set of changes to deal with.

Sau!

>  > --
>  > 1.7.10.4
>  >
>  >
>  > _______________________________________________
>  > Openembedded-core mailing list
>  > Openembedded-core@lists.openembedded.org
> <mailto:Openembedded-core@lists.openembedded.org>
>  > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>  >
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2487 bytes --]

On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com> wrote:
> On 06/29/2012 02:52 PM, Khem Raj wrote:
>>
>>
>> On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com
>> <mailto:sgw@linux.intel.com>> wrote:
>>  > By doing this we can easily add addtional packages that can be
>>  > greedy before PN, but after some of the other standard packages.
>>  >
>>  > This will also allow us to simplify the lib_package class to set
>>  > this variable.
>>  >
>>  > Signed-off-by: Saul Wold <sgw@linux.intel.com
>> <mailto:sgw@linux.intel.com>>
>>  > ---
>>  >  meta/conf/bitbake.conf |    3 ++-
>>  >  1 file changed, 2 insertions(+), 1 deletion(-)
>>  >
>>  > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>>  > index 9377ee6..df4907e 100644
>>  > --- a/meta/conf/bitbake.conf
>>  > +++ b/meta/conf/bitbake.conf
>>  > @@ -254,7 +254,8 @@ SOLIBSDEV_darwin = ".dylib"
>>  >  SOLIBSDEV_darwin8 = ".dylib"
>>  >  SOLIBSDEV_darwin9 = ".dylib"
>>  >
>>  > -PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
>> ${PN}-locale ${PN}"
>>  > +PACKAGE_BEFORE_PN ?= ""
>>  > +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
>> ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
>>  >  PACKAGES_DYNAMIC = "${PN}-locale-*"
>>  >  FILES = ""
>>  >
>>
>>
>> Can it appear at the beginning before pn-dbg?
>> Then you could just prepend I don't think any of those predefined
>> packages will have anything of interest that's in pn-bin
>
> No that's won't work since pn-dev wants to get -config binaries and
sometimes there are other binaries that pn-dev wants, I did try that
initially, by having -bin in front with =+ and got failures.
>
> This has been a tricky set of changes to deal with.


Hmm this variable really looks very specific not something for general
bitbake.conf I think
Can pn-bin appear after pn  since in case of libraries on should not have
much interest in binaries
> Sau!
>
>>  > --
>>  > 1.7.10.4
>>  >
>>  >
>>  > _______________________________________________
>>  > Openembedded-core mailing list
>>  > Openembedded-core@lists.openembedded.org
>> <mailto:Openembedded-core@lists.openembedded.org>
>>  > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>  >
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 3826 bytes --]

[PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2475 bytes --]

On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com> wrote:
> On 06/29/2012 02:52 PM, Khem Raj wrote:
>>
>>
>> On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com
>> <mailto:sgw@linux.intel.com>> wrote:
>>  > By doing this we can easily add addtional packages that can be
>>  > greedy before PN, but after some of the other standard packages.
>>  >
>>  > This will also allow us to simplify the lib_package class to set
>>  > this variable.
>>  >
>>  > Signed-off-by: Saul Wold <sgw@linux.intel.com
>> <mailto:sgw@linux.intel.com>>
>>  > ---
>>  >  meta/conf/bitbake.conf |    3 ++-
>>  >  1 file changed, 2 insertions(+), 1 deletion(-)
>>  >
>>  > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>>  > index 9377ee6..df4907e 100644
>>  > --- a/meta/conf/bitbake.conf
>>  > +++ b/meta/conf/bitbake.conf
>>  > @@ -254,7 +254,8 @@ SOLIBSDEV_darwin = ".dylib"
>>  >  SOLIBSDEV_darwin8 = ".dylib"
>>  >  SOLIBSDEV_darwin9 = ".dylib"
>>  >
>>  > -PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
>> ${PN}-locale ${PN}"
>>  > +PACKAGE_BEFORE_PN ?= ""
>>  > +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
>> ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
>>  >  PACKAGES_DYNAMIC = "${PN}-locale-*"
>>  >  FILES = ""
>>  >
>>
>>
>> Can it appear at the beginning before pn-dbg?
>> Then you could just prepend I don't think any of those predefined
>> packages will have anything of interest that's in pn-bin
>
> No that's won't work since pn-dev wants to get -config binaries and
sometimes there are other binaries that pn-dev wants, I did try that
initially, by having -bin in front with =+ and got failures.
>
> This has been a tricky set of changes to deal with.


Hmm this variable really looks very specific not something for general
bitbake.conf I think
Can pn-bin appear after pn  since in case of libraries on should not have
much interest
> Sau!
>
>>  > --
>>  > 1.7.10.4
>>  >
>>  >
>>  > _______________________________________________
>>  > Openembedded-core mailing list
>>  > Openembedded-core@lists.openembedded.org
>> <mailto:Openembedded-core@lists.openembedded.org>
>>  > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>  >
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 3813 bytes --]

Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES

[Saul Wold]

On 06/29/2012 03:09 PM, Khem Raj wrote:
>
>
> On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>> wrote:
>  > On 06/29/2012 02:52 PM, Khem Raj wrote:
>  >>
>  >>
>  >> On Friday, June 29, 2012, Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>
>  >> <mailto:sgw@linux.intel.com <mailto:sgw@linux.intel.com>>> wrote:
>  >> > By doing this we can easily add addtional packages that can be
>  >> > greedy before PN, but after some of the other standard packages.
>  >> >
>  >> > This will also allow us to simplify the lib_package class to set
>  >> > this variable.
>  >> >
>  >> > Signed-off-by: Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>
>  >> <mailto:sgw@linux.intel.com <mailto:sgw@linux.intel.com>>>
>  >> > ---
>  >> >  meta/conf/bitbake.conf |    3 ++-
>  >> >  1 file changed, 2 insertions(+), 1 deletion(-)
>  >> >
>  >> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>  >> > index 9377ee6..df4907e 100644
>  >> > --- a/meta/conf/bitbake.conf
>  >> > +++ b/meta/conf/bitbake.conf
>  >> > @@ -254,7 +254,8 @@ SOLIBSDEV_darwin = ".dylib"
>  >> >  SOLIBSDEV_darwin8 = ".dylib"
>  >> >  SOLIBSDEV_darwin9 = ".dylib"
>  >> >
>  >> > -PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
>  >> ${PN}-locale ${PN}"
>  >> > +PACKAGE_BEFORE_PN ?= ""
>  >> > +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
>  >> ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
>  >> >  PACKAGES_DYNAMIC = "${PN}-locale-*"
>  >> >  FILES = ""
>  >> >
>  >>
>  >>
>  >> Can it appear at the beginning before pn-dbg?
>  >> Then you could just prepend I don't think any of those predefined
>  >> packages will have anything of interest that's in pn-bin
>  >
>  > No that's won't work since pn-dev wants to get -config binaries and
> sometimes there are other binaries that pn-dev wants, I did try that
> initially, by having -bin in front with =+ and got failures.
>  >
>  > This has been a tricky set of changes to deal with.
>
>
> Hmm this variable really looks very specific not something for general
> bitbake.conf I think
> Can pn-bin appear after pn  since in case of libraries on should not
> have much interest

No it can't appear after because PN is greedy and will grab all the 
bindir and base_bindir executable.  If anything I could move PN-bin 
definition back into lib_package, but I found it clear to define it in 
bitbake.conf with all the other PN-* definitions.

Sau!

>  > Sau!
>  >
>  >> > --
>  >> > 1.7.10.4
>  >> >
>  >> >
>  >> > _______________________________________________
>  >> > Openembedded-core mailing list
>  >> > Openembedded-core@lists.openembedded.org
> <mailto:Openembedded-core@lists.openembedded.org>
>  >> <mailto:Openembedded-core@lists.openembedded.org
> <mailto:Openembedded-core@lists.openembedded.org>>
>  >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>  >> >
>  >>
>  >>
>  >> _______________________________________________
>  >> Openembedded-core mailing list
>  >> Openembedded-core@lists.openembedded.org
> <mailto:Openembedded-core@lists.openembedded.org>
>  >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>  >

Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES

[Khem Raj]

On Fri, Jun 29, 2012 at 3:16 PM, Saul Wold <sgw@linux.intel.com> wrote:
>
> No it can't appear after because PN is greedy and will grab all the bindir
> and base_bindir executable.  If anything I could move PN-bin definition back
> into lib_package, but I found it clear to define it in bitbake.conf with all
> the other PN-* definitions.

right. In this case I think adding a variable is ok probably

[PATCH 2/7] lib_package: use PACKAGE_BEFORE_PN

[Saul Wold]

Since this check effective is not a change becase the package
order that was in this file has not really changed no PR Bumps
are needed.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/lib_package.bbclass |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/classes/lib_package.bbclass b/meta/classes/lib_package.bbclass
index 1f0542a..d514257 100644
--- a/meta/classes/lib_package.bbclass
+++ b/meta/classes/lib_package.bbclass
@@ -4,5 +4,4 @@
 # We need to allow the other packages to be greedy with what they
 # want out of /bin and /usr/bin before ${PN}-bin gets greedy.
 # 
-PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PN}-bin ${PN}"
-
+PACKAGE_BEFORE_PN = "${PN}-bin"
-- 
1.7.10.4

[PATCH 3/7] libacpi: use lib_package bbclass

[Saul Wold]

This is a clean-up following the recent addition of PN-bin
to bitbake.conf and lib_package

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-bsp/libacpi/libacpi_0.2.bb |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index 1a6dc97..b0fbf0b 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -5,7 +5,7 @@ SECTION = "base"
 HOMEPAGE = "http://www.ngolde.de/libacpi.html"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fec17f82f16630adf2dfb7d2a46f21c5"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
 	   file://makefile-fix.patch \
@@ -15,10 +15,7 @@ SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
 SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
 SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
 
-PACKAGES += "${PN}-bin"
-
-FILES_${PN} = "${libdir}/libacpi.so.*"
-FILES_${PN}-bin = "${bindir}"
+inherit lib_package
 
 COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
 
-- 
1.7.10.4

[PATCH 4/7] pulseaudio: use lib_package bbclass

[Saul Wold]

This is a clean-up following the recent addition of PN-bin
to bitbake.conf and lib_package

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc    |    3 +--
 meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index a2f0d9f..c3d6d98 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -79,8 +79,7 @@ FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
                     ${libdir}/pulse-${PV}/modules/.debug"
 FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake"		    
 FILES_${PN}-conf = "${sysconfdir}"
-FILES_${PN}-bin = "${bindir}/* \
-                   ${sysconfdir}/default/volatiles/volatiles.04_pulse"
+FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
 FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules"
 FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
 FILES_${PN}-misc = "${bindir}/*"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
index 02d4180..e88a3a5 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r9"
+PR = "r10"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
 
-- 
1.7.10.4

[PATCH 5/7] db: use lib_package bbclass

[Saul Wold]

This is a clean-up following the recent addition of PN-bin
to bitbake.conf and lib_package

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/db/db_5.3.15.bb |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-support/db/db_5.3.15.bb b/meta/recipes-support/db/db_5.3.15.bb
index 0df874e..0fc396e 100644
--- a/meta/recipes-support/db/db_5.3.15.bb
+++ b/meta/recipes-support/db/db_5.3.15.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 RCONFLICTS_${PN} = "db3"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
 SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
@@ -47,8 +47,6 @@ B = "${WORKDIR}/db-${PV}/build_unix"
 # management on the system.
 inherit lib_package
 
-# Package contents
-FILES_${PN}-bin = "${bindir}/*"
 # The dev package has the .so link (as in db3) and the .a's -
 # it is therefore incompatible (cannot be installed at the
 # same time) as the db3 package
-- 
1.7.10.4

[PATCH 6/7] gnutls: use lib_package bbclass

[Saul Wold]

This is a clean-up following the recent addition of PN-bin
to bitbake.conf and lib_package

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/gnutls/gnutls.inc |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index b16dd21..d6c187f 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
 DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI = "${GNU_MIRROR}/gnutls/gnutls-${PV}.tar.bz2"
 
-inherit autotools binconfig pkgconfig gettext
+inherit autotools binconfig pkgconfig gettext lib_package
 
 EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
               --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
@@ -35,15 +35,7 @@ do_configure_prepend() {
 	done
 }
 
-PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin ${PN}-xx"
-
-FILES_${PN}-bin = "${bindir}/gnutls-serv \
-                   ${bindir}/gnutls-cli \
-                   ${bindir}/srptool \
-                   ${bindir}/psktool \
-                   ${bindir}/p11tool \
-                   ${bindir}/certtool \
-                   ${bindir}/gnutls-srpcrypt"
+PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-xx"
 
 FILES_${PN}-dev += "${bindir}/gnutls-cli-debug"
 FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
-- 
1.7.10.4

[PATCH 7/7] speex: use lib_package bbclass

[Saul Wold]

This is a clean-up following the recent addition of PN-bin
to bitbake.conf and lib_package

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-multimedia/speex/speex_1.2rc1.bb |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
index 7370134..faf63b0 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 = "r1"
+PR = "r2"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
 
@@ -16,12 +16,8 @@ SRC_URI[sha256sum] = "342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f117
 
 PARALLEL_MAKE = ""
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig lib_package
 
 EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
                  --disable-float-api --disable-vbr \
                  --with-ogg-includes=${STAGING_INCDIR} --disable-oggtest"
-
-PACKAGES += "${PN}-bin"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-bin = "${bindir}"
-- 
1.7.10.4