@@ -4,20 +4,48 @@ LICENSE = "GPLv2.1+"
RECIPE_TYPES = "machine"
-inherit autotools-autoreconf make pkgconfig
+DEPENDS += "popt libpthread libuuid liburcu userspace-rcu-dev liblttng-ust \
+ liblttng-ust-ctl libdl lttng-ust-dev liblttng-ust-fork \
+ liblttng-ust-libc-wrapper"
-SRC_URI = "http://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2"
-
-LIBRARY_DEPENDS = "libpopt libpthread librt libuuid libdl"
+inherit autotools-autoreconf make pkgconfig auto-package-libs
-LIBRARY_DEPENDS += "lttng-ust${DEPENDS_LTTNG_UST_VERSION}"
-DEPENDS_LTTNG_UST_VERSION ?= ""
+SRC_URI = "http://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2"
EXTRA_OECONF += "CFLAGS=-I${WORKDIR}/build/include/"
-# Recipe build dependencies
-DEPENDS =+ "${LIBRARY_DEPENDS} lttng-ust-dev${DEPENDS_LTTNG_UST_VERSION}"
-
-# Package dependencies
-DEPENDS_${PN} += "${LIBRARY_DEPENDS}"
-RDEPENDS_${PN} += "${LIBRARY_DEPENDS}"
+do_install[postfuncs] += "do_install_fixup_consumerd"
+do_install_fixup_consumerd() {
+ cp -aR ${D}${libdir}/lttng/libexec/* ${D}${bindir}
+ rm -rf ${D}${libdir}/lttng
+}
+
+inherit auto-package-libs
+AUTO_PACKAGE_LIBS = "lttng-ctl"
+FILES_${PN}-liblttng-ctl-dev = "${includedir}/lttng/lttng.h"
+DEPENDS_${PN}-liblttng-ctl = "libpopt libpthread libc librt liburcu \
+ liburcu-common libuuid"
+RDEPENDS_${PN}-liblttng-ctl = "libpopt libpthread libc librt liburcu \
+ liburcu-common libuuid"
+
+AUTO_PACKAGE_UTILS = "lttng lttng-consumerd lttng-sessiond lttng-relayd"
+AUTO_PACKAGE_UTILS_DEPENDS += "libc liburcu liburcu-common libuuid"
+AUTO_PACKAGE_UTILS_RDEPENDS += "liburcu liburcu-common libuuid"
+DEPENDS_${PN}-lttng = "liblttng-ctl libpopt librt"
+RDEPENDS_${PN}-lttng = "liblttng-ctl libpopt librt"
+DEPENDS_${PN}-lttng-consumerd = "liblttng-ust-ctl librt liburcu-bp \
+ liburcu-cds liblttng-ctl"
+RDEPENDS_${PN}-lttng-consumerd = "liblttng-ust-ctl librt liburcu-bp \
+ liburcu-cds liblttng-ctl"
+DEPENDS_${PN}-lttng-sessiond = "libdl liblttng-ctl liblttng-ust-ctl \
+ librt liburcu-bp liburcu-cds"
+RDEPENDS_${PN}-lttng-sessiond = "libdl liblttng-ctl liblttng-ust-ctl \
+ librt liburcu-bp liburcu-cds"
+DEPENDS_${PN}-lttng-relayd = "liblttng-ctl libpopt librt"
+RDEPENDS_${PN}-lttng-relayd = "liblttng-ctl"
+DEPENDS_${PN} += "libc libdl liblttng-ctl liblttng-ust libpopt libpthread \
+ librt liburcu liburcu-bp liburcu-cds liburcu-common libuuid \
+ liblttng-ust-ctl"
+RDEPENDS_${PN} += "libc libdl liblttng-ctl liblttng-ust libpopt libpthread \
+ librt liburcu liburcu-bp liburcu-cds liburcu-common libuuid \
+ liblttng-ust-ctl"