From 9045fa6ab755d303a2052653da1ed63032f527a7 Mon Sep 17 00:00:00 2001 From: "Gabbasov, Andrew" Date: Mon, 20 Dec 2010 12:40:14 -0800 Subject: [PATCH] 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 Signed-off-by: Tom Rini --- recipes/lttng/ust.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes/lttng/ust.inc b/recipes/lttng/ust.inc index 26e4d4292b..39ef1f5ab3 100644 --- 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" -- 2.39.5