summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-06 01:16:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:02:56 +0100
commitfd259b8894880da2dd4c5bb68386e13b2323cc8e (patch)
treed20529de5f46eb4c06eb54f7bd82c34bce4e1556
parentb11e5d77bcfd6e916141f941fba10644bff5a110 (diff)
downloadpoky-fd259b8894880da2dd4c5bb68386e13b2323cc8e.tar.gz
bitbake.conf: add PN-bin and cleanup lib_package.bbclass
Since we now have PN as the end of the package list, we can almost get rid of lib_package, each recipe can just add PACKAGES =+ PN-bin instead of the inherit (From OE-Core rev: 7acdd6177fda4643d2f04f45eb7490e45a3d491e) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/lib_package.bbclass14
-rw-r--r--meta/conf/bitbake.conf2
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/classes/lib_package.bbclass b/meta/classes/lib_package.bbclass
index 9843ed9f4c..1f0542a4ca 100644
--- a/meta/classes/lib_package.bbclass
+++ b/meta/classes/lib_package.bbclass
@@ -1,8 +1,8 @@
1PACKAGES =+ "${PN}-bin" 1#
2# ${PN}-bin is defined in bitbake.conf
3#
4# We need to allow the other packages to be greedy with what they
5# want out of /bin and /usr/bin before ${PN}-bin gets greedy.
6#
7PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PN}-bin ${PN}"
2 8
3FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \
4 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
5 ${base_libdir}/*${SOLIBS} \
6 ${datadir}/${BPN} ${libdir}/${BPN}"
7
8FILES_${PN}-bin = "${bindir}/* ${sbindir}/* /bin/* /sbin/*"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e0727578e2..face25e80c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -266,6 +266,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
266 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ 266 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
267 ${libdir}/bonobo/servers" 267 ${libdir}/bonobo/servers"
268 268
269FILES_${PN}-bin = "${bindir}/* ${sbindir}/*"
270
269FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ 271FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
270 ${datadir}/gnome/help" 272 ${datadir}/gnome/help"
271SECTION_${PN}-doc = "doc" 273SECTION_${PN}-doc = "doc"