Simplify lib_package
cover Simplify lib_package
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(-)
Signature · 1 line
1.7.10.4
PATCH 1/7 bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
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.
--- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/conf/bitbake.conf +2 -1
@@ -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 = ""
Signature · 1 line
1.7.10.4
Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
Quoted 16 lines · 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_packageclass to set this variable.Signed-off-by Saul Wold <[email protected]>--- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/conf/bitbake.conf +0
-0
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 257
Quoted 4 lines
meta/conf/bitbake.conf +0
-1@@ -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}"
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 258
Quoted 2 lines
meta/conf/bitbake.conf +2
-0+PACKAGE_BEFORE_PN ?= "" +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PACKAGE_BEFORE_PN} ${PN}"
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 261
Quoted 3 lines
meta/conf/bitbake.conf +0
-0PACKAGES_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
Quoted 9 lines
--
1.7.10.4_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
Quoted 29 lines · Khem Raj
Quoted 7 lines · On Friday, June 29, 2012, Saul Wold <[email protected]…
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_packageclass to set this variable.Signed-off-by Saul Wold <[email protected]<mailto:[email protected]>>
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 257
Quoted 13 lines
--- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/conf/bitbake.conf +0
-1@@ -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}"
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 258
Quoted 2 lines
meta/conf/bitbake.conf +2
-0+PACKAGE_BEFORE_PN ?= "" +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
Quoted 8 lines
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 261
Quoted 3 lines
meta/conf/bitbake.conf +0
-0PACKAGES_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!
Quoted 16 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Openembedded-core mailing list
[email protected]<mailto:[email protected]>
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
Quoted 35 lines · Saul Wold
Quoted 34 lines · Khem Raj
Quoted 7 lines · On Friday, June 29, 2012, Saul Wold <[email protected]…
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_packageclass to set this variable.Signed-off-by Saul Wold <[email protected]<mailto:[email protected]>>
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 257
Quoted 13 lines
--- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/conf/bitbake.conf +0
-1@@ -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}"
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 258
Quoted 2 lines
meta/conf/bitbake.conf +2
-0+PACKAGE_BEFORE_PN ?= "" +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
Quoted 3 lines
meta/conf/bitbake.conf +0
-0PACKAGES_DYNAMIC = "${PN}-locale-*" FILES = ""
Quoted 5 lines
Quoted 3 lines
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-binNo 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.
Quoted 2 lines
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
Quoted 19 lines
Sau!
Quoted 16 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Openembedded-core mailing list
[email protected]<mailto:[email protected]>
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
PATCH 1/7 bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
In reply to Saul WoldQuoted 35 lines · Saul Wold
Quoted 34 lines · Khem Raj
Quoted 7 lines · On Friday, June 29, 2012, Saul Wold <[email protected]…
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_packageclass to set this variable.Signed-off-by Saul Wold <[email protected]<mailto:[email protected]>>
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 257
Quoted 13 lines
--- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/conf/bitbake.conf +0
-1@@ -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}"
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 258
Quoted 2 lines
meta/conf/bitbake.conf +2
-0+PACKAGE_BEFORE_PN ?= "" +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
Quoted 3 lines
meta/conf/bitbake.conf +0
-0PACKAGES_DYNAMIC = "${PN}-locale-*" FILES = ""
Quoted 5 lines
Quoted 3 lines
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-binNo 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.
Quoted 2 lines
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
Quoted 19 lines
Sau!
Quoted 16 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Openembedded-core mailing list
[email protected]<mailto:[email protected]>
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
Quoted 49 lines · Khem Raj
Quoted 4 lines · On Friday, June 29, 2012, Saul Wold <[email protected]…
Quoted 3 lines · Khem Raj
On Friday, June 29, 2012, Saul Wold <[email protected]
<mailto:[email protected]>
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines · <mailto:[email protected] <mailto:[email protected]>>> 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_packageclass to set this variable.Signed-off-by Saul Wold <[email protected]<mailto:[email protected]>
Quoted 23 lines
Quoted 23 lines
<mailto:[email protected] <mailto:[email protected]>>>
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 257
Quoted 13 lines
--- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/conf/bitbake.conf +0
-1@@ -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}"
meta/conf/bitbake.conf SOLIBSDEV_darwin = ".dylib" · line 258
Quoted 2 lines
meta/conf/bitbake.conf +2
-0+PACKAGE_BEFORE_PN ?= "" +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
Quoted 3 lines
meta/conf/bitbake.conf +0
-0PACKAGES_DYNAMIC = "${PN}-locale-*" FILES = ""Quoted 5 lines
Quoted 3 lines
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-binNo 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.
Quoted 1 line
Quoted 7 lines
Quoted 1 line
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!
Quoted 22 lines
Quoted 9 lines
Sau!
Quoted 7 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Openembedded-core mailing list
[email protected]<mailto:[email protected]>
Quoted 1 line
Quoted 1 line
<mailto:[email protected]
<mailto:[email protected]>>
Quoted 7 lines
Quoted 7 lines
_______________________________________________
Openembedded-core mailing list
[email protected]<mailto:[email protected]>
Quoted 2 lines
Re: [PATCH 1/7] bitbake.conf: Add PACKAGE_BEFORE_PN to PACKAGES
Quoted 5 lines · Saul Wold
No it can't appear after because PN is greedy and will grab all the bindir and
base_bindirexecutable. If anything I could move PN-bin definition back intolib_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
In reply to Saul WoldSince 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.
--- meta/classes/lib_package.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes/lib_package.bbclass +1 -2
@@ -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"
Signature · 1 line
1.7.10.4
PATCH 3/7 libacpi: use lib_package bbclass
In reply to Saul WoldThis is a clean-up following the recent addition of PN-bin to bitbake.conf and lib_package
--- meta/recipes-bsp/libacpi/libacpi_0.2.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
meta/recipes-bsp/libacpi/libacpi_0.2.bb +2 -5
@@ -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.*)'
Signature · 1 line
1.7.10.4
PATCH 4/7 pulseaudio: use lib_package bbclass
In reply to Saul WoldThis is a clean-up following the recent addition of PN-bin to bitbake.conf and lib_package
--- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 3 +-- meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -2
@@ -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}/*"
meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +1 -1
@@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r9" +PR = "r10" DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
Signature · 1 line
1.7.10.4
PATCH 5/7 db: use lib_package bbclass
In reply to Saul WoldThis is a clean-up following the recent addition of PN-bin to bitbake.conf and lib_package
--- meta/recipes-support/db/db_5.3.15.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-support/db/db_5.3.15.bb +1 -3
@@ -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
Signature · 1 line
1.7.10.4
PATCH 6/7 gnutls: use lib_package bbclass
In reply to Saul WoldThis is a clean-up following the recent addition of PN-bin to bitbake.conf and lib_package
--- meta/recipes-support/gnutls/gnutls.inc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
meta/recipes-support/gnutls/gnutls.inc +3 -11
@@ -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.*"
Signature · 1 line
1.7.10.4
PATCH 7/7 speex: use lib_package bbclass
In reply to Saul WoldThis is a clean-up following the recent addition of PN-bin to bitbake.conf and lib_package
--- meta/recipes-multimedia/speex/speex_1.2rc1.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
meta/recipes-multimedia/speex/speex_1.2rc1.bb +2 -6
@@ -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}"
Signature · 1 line
1.7.10.4