summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mhatle@windriver.com>2010-08-20 08:38:04 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-20 23:39:43 +0100
commitb4bef9ad8e72b0d9ea29d6e2e6c6632dff93bdab (patch)
tree0f77d9dae1ff34eee418b0721fd66819fb377fb9
parent5d2e88c3c233352d5724aa87b1fb6e08ac4693b4 (diff)
downloadast2050-yocto-poky-b4bef9ad8e72b0d9ea29d6e2e6c6632dff93bdab.zip
ast2050-yocto-poky-b4bef9ad8e72b0d9ea29d6e2e6c6632dff93bdab.tar.gz
bitbake.conf: Add shared/pkgconfig files to standard -dev glob
Add the pkgconfig files that may appear into the shared directory into the -dev globbing. Also change the udev integration to remove the manual instance of the shared directory .pc file. Signed-off-by: Mark Hatle <mhatle@windriver.com>
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/packages/udev/udev-new.inc4
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 31d8668..788ba4e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -210,7 +210,8 @@ SECTION_${PN}-doc = "doc"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
- ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+ ${datadir}/pkgconfig ${datadir}/aclocal \
+ ${base_libdir}/*.a ${base_libdir}/*.o"
SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1"
RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})"
diff --git a/meta/packages/udev/udev-new.inc b/meta/packages/udev/udev-new.inc
index b09c748..87f9633 100644
--- a/meta/packages/udev/udev-new.inc
+++ b/meta/packages/udev/udev-new.inc
@@ -47,9 +47,9 @@ INITSCRIPT_PARAMS_udev = "start 04 S ."
INITSCRIPT_NAME_udev-cache = "udev-cache"
INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
-FILES_${PN} += "${libexecdir} ${datadir}/pkgconfig/udev.pc ${libdir}/ConsoleKit"
+FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
FILES_${PN}-dbg += "${libexecdir}/.debug"
-FILES_${PN}-dev = ""
+FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
FILES_libudev = "${base_libdir}/libudev.so.*"
FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
OpenPOWER on IntegriCloud