From 66c36bcb7d9368718453265e58bd5e3c854c786a Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 5 Jun 2012 04:52:21 -0700 Subject: 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. Signed-off-by: Saul Wold --- meta/conf/bitbake.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/conf/bitbake.conf') 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" SOLIBSDEV_darwin8 = ".dylib" SOLIBSDEV_darwin9 = ".dylib" -PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PN}" PACKAGES_DYNAMIC = "${PN}-locale-*" FILES = "" @@ -270,9 +270,11 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ ${datadir}/gnome/help" SECTION_${PN}-doc = "doc" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ +FILES_SOLIBSDEV ?= "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*${SOLIBSDEV}" +FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ - ${datadir}/aclocal ${base_libdir}/*.o" + ${datadir}/aclocal ${base_libdir}/*.o \ + ${libdir}/${BPN}/*.la ${base_libdir}/*.la" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" -- cgit v1.2.3