From dcbb746bfb540d16d547b2b5b3477f7434fb85ac Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 8 Aug 2007 21:38:40 +0000
Subject: bitbake.conf: Merge in section and dependency setting for -dbg and
 -dev packages (from poky). Start to allow multiple entries in PKG_CONFIG_PATH
 (from poky)

---
 conf/bitbake.conf | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'conf/bitbake.conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 19910d32e7..3b60983bcc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -110,23 +110,33 @@ RPROVIDES = ""
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 FILES = ""
+
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
-SECTION_${PN}-doc = "doc"
+
 FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
             ${datadir}/gnome/help"
-SECTION_${PN}-dev = "devel"
+SECTION_${PN}-doc = "doc"
+
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
                 /lib/*.a /lib/*.o ${datadir}/aclocal"
-FILES_${PN}-locale = "${datadir}/locale"
+SECTION_${PN}-dev = "devel"
+ALLOW_EMPTY_${PN}-dev = "1"
+RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+
 FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
             /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \
 	    ${libdir}/matchbox-panel/.debug"
+SECTION_${PN}-dbg = "devel"
+ALLOW_EMPTY_${PN}-dbg = "1"
+RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+
+FILES_${PN}-locale = "${datadir}/locale"
 
 # File manifest
 
@@ -414,7 +424,8 @@ SLOT = "0"
 
 # Other
 
-export PKG_CONFIG_PATH = "${STAGING_LIBDIR}/pkgconfig"
+export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig"
+export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 
 export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake"
-- 
cgit v1.2.3


From 6ccac10beeaaa02a86081bd6179fd57c208ad6b1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 8 Aug 2007 23:18:34 +0000
Subject: bitbake.conf: Weakly assign DL_DIR so it can be set from the
 environment (from poky)

---
 conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf/bitbake.conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 3b60983bcc..dc3378fd95 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -152,7 +152,6 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
 
 TMPDIR = "${TOPDIR}/tmp"
 CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
-DL_DIR = "${TMPDIR}/downloads"
 CVSDIR = "${DL_DIR}/cvs"
 SVNDIR = "${DL_DIR}/svn"
 GITDIR = "${DL_DIR}/git"
@@ -467,6 +466,7 @@ require conf/sanity.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
+DL_DIR ?= "${TMPDIR}/downloads"
 IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 MACHINE_TASK_PROVIDER ?= "task-base"
-- 
cgit v1.2.3