From 30ff2e3d9a1c5fe783d63ef684fa4213b872563a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 2 Jul 2013 11:14:41 -0300 Subject: lttng-ust: Update to 2.2.0 based release (From OE-Core rev: d906713b7b59e926595e96fe54436015e0378317) Signed-off-by: Otavio Salvador Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../lttng-ust/build-Fix-out-of-tree-build.patch | 28 ++++++++++++++++++ meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb | 33 ---------------------- meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb | 33 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb create mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch new file mode 100644 index 0000000000..cc3220ac18 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch @@ -0,0 +1,28 @@ +From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Tue, 2 Jul 2013 10:25:06 -0300 +Subject: [PATCH] build: Fix out-of-tree build + +To allow out-of-tree build, we need to include top_buildir in include +directories or the generated config header won't be found. + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador +--- + liblttng-ust-comm/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am +index 2ae997c..065dbbf 100644 +--- a/liblttng-ust-comm/Makefile.am ++++ b/liblttng-ust-comm/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include + + noinst_LTLIBRARIES = liblttng-ust-comm.la + +-- +1.8.3.1 + diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb b/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb deleted file mode 100644 index 93852b0af6..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.0" -DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library to trace userspace codes." -HOMEPAGE = "http://lttng.org/ust" -BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" - -LICENSE = "LGPLv2.1+ & BSD & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ - file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ - file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" - -inherit autotools - -DEPENDS = "liburcu util-linux" - -# For backwards compatibility after rename -RPROVIDES_${PN} = "lttng2-ust" -RREPLACES_${PN} = "lttng2-ust" -RCONFLICTS_${PN} = "lttng2-ust" - -SRCREV = "3f7a0876566a432ad2cc2b27a2725641e36da92d" -PV = "2.1.2" -PR = "r0" -PE = "2" - -SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \ - file://depends-liblttng-ust-tracepoin.patch \ - " - -S = "${WORKDIR}/git" - -do_configure_prepend () { - ( cd ${S}; ${S}/bootstrap ) -} diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb new file mode 100644 index 0000000000..d03f20701b --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.0" +DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library to trace userspace codes." +HOMEPAGE = "http://lttng.org/ust" +BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" + +LICENSE = "LGPLv2.1+ & BSD & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ + file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ + file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" + +inherit autotools + +DEPENDS = "liburcu util-linux" + +# For backwards compatibility after rename +RPROVIDES_${PN} = "lttng2-ust" +RREPLACES_${PN} = "lttng2-ust" +RCONFLICTS_${PN} = "lttng2-ust" + +SRCREV = "cfaee541fea7f5760b5501913c6902f5e4da9dba" +PV = "2.2.0" +PE = "2" + +SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \ + file://depends-liblttng-ust-tracepoin.patch \ + file://build-Fix-out-of-tree-build.patch \ + " + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ( cd ${S}; ${S}/bootstrap ) +} -- cgit v1.2.3-54-g00ecf