summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-05 04:52:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:02:56 +0100
commitf68cbf56d8f2a45ce44a59d0411cdda8ec7e2c36 (patch)
treee06cfa2a9d6158cafe41ab80997dcbb9f366c9a7 /meta
parent504e3733e51e7e2c1083a24546183817213786f8 (diff)
downloadpoky-f68cbf56d8f2a45ce44a59d0411cdda8ec7e2c36.tar.gz
bitbake.conf: reorder PACKAGES list
This change re-orders the PACKAGES list to move PN to the end of the list this will ensure that base package gets the final bits since the packaging is greedy. We can then have -dev and other package get bits first. (From OE-Core rev: 66c36bcb7d9368718453265e58bd5e3c854c786a) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 97930a7440..e0727578e2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -253,7 +253,7 @@ SOLIBSDEV_darwin = ".dylib"
253SOLIBSDEV_darwin8 = ".dylib" 253SOLIBSDEV_darwin8 = ".dylib"
254SOLIBSDEV_darwin9 = ".dylib" 254SOLIBSDEV_darwin9 = ".dylib"
255 255
256PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" 256PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PN}"
257PACKAGES_DYNAMIC = "${PN}-locale-*" 257PACKAGES_DYNAMIC = "${PN}-locale-*"
258FILES = "" 258FILES = ""
259 259
@@ -270,9 +270,11 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
270 ${datadir}/gnome/help" 270 ${datadir}/gnome/help"
271SECTION_${PN}-doc = "doc" 271SECTION_${PN}-doc = "doc"
272 272
273FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ 273FILES_SOLIBSDEV ?= "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*${SOLIBSDEV}"
274FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
274 ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ 275 ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
275 ${datadir}/aclocal ${base_libdir}/*.o" 276 ${datadir}/aclocal ${base_libdir}/*.o \
277 ${libdir}/${BPN}/*.la ${base_libdir}/*.la"
276SECTION_${PN}-dev = "devel" 278SECTION_${PN}-dev = "devel"
277ALLOW_EMPTY_${PN}-dev = "1" 279ALLOW_EMPTY_${PN}-dev = "1"
278RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" 280RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"