summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2013-11-13 21:45:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:26 +0000
commitbcdda02ab9009a6f8d8c02fdd432161c52824c18 (patch)
tree8f5bb7ebc38908e92c9ff16693ba4a940cb6d32d
parent66a3db6175830ed1192975d61b007d4743e75715 (diff)
downloadpoky-bcdda02ab9009a6f8d8c02fdd432161c52824c18.tar.gz
udev: remove extra -dev/-dbg packages
We don't support multiple -dbg/-dev packages, the package can generate them but the system does not correctly handle them. Just move all devel stuffs into 'udev-dev' and all debug stuffs into 'udev-dbg'. (From OE-Core rev: 014f7a33f399192268f28acac835551413c4768d) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/udev/udev.inc16
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 02cab3b0d6..db09c54843 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -45,8 +45,8 @@ EXTRA_OECONF = "--disable-introspection \
45 " 45 "
46 46
47PACKAGES =+ "udev-utils udev-cache" 47PACKAGES =+ "udev-utils udev-cache"
48PACKAGES =+ "libudev libudev-dev libudev-dbg" 48PACKAGES =+ "libudev"
49PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" 49PACKAGES =+ "libgudev"
50 50
51INITSCRIPT_PACKAGES = "udev udev-cache" 51INITSCRIPT_PACKAGES = "udev udev-cache"
52INITSCRIPT_NAME_udev = "udev" 52INITSCRIPT_NAME_udev = "udev"
@@ -61,15 +61,13 @@ FILES_${PN}-dbg += "${libexecdir}/.debug"
61FILES_${PN}-dbg += "${base_libdir}/udev/.debug/" 61FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
62FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*" 62FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
63FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*" 63FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*"
64FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc" 64FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
65 ${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
66 ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc \
67 ${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
68 ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
65FILES_libudev = "${base_libdir}/libudev.so.*" 69FILES_libudev = "${base_libdir}/libudev.so.*"
66FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
67FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
68 ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
69FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*" 70FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
70FILES_libgudev-dbg = "${base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
71FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
72 ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
73FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" 71FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
74 72
75FILES_udev-utils = "${bindir}/udevadm" 73FILES_udev-utils = "${bindir}/udevadm"