ust.inc: Rework FILES

libust.so is actually an ld script (grouping libust.so.0 and
libust_initializer.o), so I doubt it has any usefullness on the target.  The
note about preloading should concern other libust*.so, that are indeed used in
preloading by 'usttrace' script. And these .so libraries are going to target,
not to -dev. And for libust.so that script preloads libust.so.0.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/recipes/lttng/ust.inc b/recipes/lttng/ust.inc
index 26e4d42..39ef1f5 100644 (file)
--- a/recipes/lttng/ust.inc
+++ b/recipes/lttng/ust.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2 and LGPLv2.1"
 DEPENDS = "liburcu"
 
-PR = "r3"
+PR = "r4"
 
 inherit update-rc.d
 
@@ -36,5 +36,9 @@ do_install_append () {
         install -m 0755 ${WORKDIR}/ustd.init ${D}${sysconfdir}/init.d/ustd
 }
 
-# Need the .so symlinks for preload to work
-FILES_${PN} += "${libdir}/libust*.so"
+# We need to have -dev get parsed first.  Need the .so symlinks for preload to
+# work
+PACKAGES = "${PN}-dev ${PN}-dbg ${PN} ${PN}-static ${PN}-doc"
+FILES_${PN}-dev = "${includedir} ${libdir}/*.la ${libdir}/*.o ${libdir}/libust.so"
+FILES_${PN} += "${libdir}/lib*${SOLIBS} ${libdir}/lib*${SOLIBSDEV}"
+INSANE_SKIP_${PN} = "1"