[PATCH 1/3] lttng2-ust: updated to version 2.0.2

[PATCH 1/3] lttng2-ust: updated to version 2.0.2

[Bogdan Marinescu]

Tested with 'lttv' on core-image-lsb.

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 .../{lttng2-ust_1.9.4.bb => lttng2-ust_2.0.2.bb}   |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_1.9.4.bb => lttng2-ust_2.0.2.bb} (81%)

diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
similarity index 81%
rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
rename to meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
index 87d866e..8f650a4 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library t
 HOMEPAGE = "http://lttng.org/lttng2.0"
 BUGTRACKER = "n/a"
 
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+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"
 
@@ -12,8 +12,8 @@ inherit autotools
 
 DEPENDS = "liburcu util-linux"
 
-SRCREV = "eeee05f35f014a8c068e0d29b18629cafbfdfc1d"
-PV = "1.9.4+git${SRCPV}"
+SRCREV = "a367ee66aad3ffd21ef64d1b24efc6f862e09562"
+PV = "2.0.2+git${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git"
-- 
1.7.4.1

[PATCH 2/3] lttng-tools: updated to 2.0.1

[Bogdan Marinescu]

Removed patch for ARM compilation, as it seems that the upstream fixed
the ARM compilation problem in a slightly different way (tested by compiling
lttng-tools for MACHINE=qemuarm)

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 ...tools-fix-compiling-error-for-powerpc-arm.patch |   27 --------------------
 ...tng-tools_2.0-pre16.bb => lttng-tools_2.0.1.bb} |   12 +++++---
 2 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
 rename meta/recipes-kernel/lttng-2.0/{lttng-tools_2.0-pre16.bb => lttng-tools_2.0.1.bb} (70%)

diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch b/meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
deleted file mode 100644
index 73253d1..0000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Pending
-
-Fix compiling error on powerpc and arm
-
-For powerpc and arm, some MAP_ are defined asm/mman.h,
-so including it in header.
-
-Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
----
- common/runas.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/common/runas.c b/common/runas.c
-index f612ccc..62a2791 100644
---- a/common/runas.c
-+++ b/common/runas.c
-@@ -29,6 +29,7 @@
- #include <fcntl.h>
- #include <sched.h>
- #include <sys/mman.h>
-+#include <asm/mman.h>
-
- #include <lttngerr.h>
-
--- 
-1.7.5.4
-
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
similarity index 70%
rename from meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
rename to meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
index d3a6a30..e7f1016 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
@@ -5,18 +5,17 @@ to extract program execution details from the Linux operating system \
 and interpret them."
 
 LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ab682a4729389c3f11913d758affe98e \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=61273c2e3f60dd38a74b01beb5f51fbd \
                     file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
 
 DEPENDS = "liburcu popt lttng2-ust"
 
-SRCREV = "9beed4cb465347c778e4f982c330cef78f2628b7"
-PV = "v2.0.pre16+git${SRCREV}"
+SRCREV = "8c3919ea2dc77fdd47fb1c90e41490a20bb4d478"
+PV = "v2.0.1+git${SRCREV}"
 PR = "r0"
 
-SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git\
-           file://lttng-tools-fix-compiling-error-for-powerpc-arm.patch"
+SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
@@ -24,6 +23,9 @@ inherit autotools
 
 export KERNELDIR="${STAGING_KERNEL_DIR}"
 
+FILES_${PN} += "${libdir}/lttng/libexec/*"
+FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+
 # Due to liburcu not building for MIPS currently this recipe needs to
 # be limited also.
 # So here let us first suppport x86/arm/powerpc platforms now.
-- 
1.7.4.1

[PATCH 3/3] Updated distro-tracking-fields.inc

[Bogdan Marinescu]

Updated metadata for lttng-tools.

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 5afe38f..c6772de 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3069,11 +3069,11 @@ RECIPE_LAST_UPDATE_pn-lttng-viewer = "Apr 20, 2011"
 RECIPE_MAINTAINER_pn-lttng-viewer = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-lttng-tools = "green"
-RECIPE_LATEST_VERSION_pn-lttng-tools = "unknown"
+RECIPE_LATEST_VERSION_pn-lttng-tools = "2.0.1"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lttng-tools = "unknown"
-RECIPE_LATEST_RELEASE_DATE_pn-lttng-tools = "unknown"
-RECIPE_LAST_UPDATE_pn-lttng-tools = "Jan 17, 2012"
-RECIPE_MAINTAINER_pn-lttng-tools = "Dexuan Cui <dexuan.cui@intel.com>"
+RECIPE_LATEST_RELEASE_DATE_pn-lttng-tools = "April 19, 2012"
+RECIPE_LAST_UPDATE_pn-lttng-tools = "May 24, 2012"
+RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 DISTRO_PN_ALIAS_pn-lttng-tools = ""
 
 RECIPE_MAINTAINER_pn-systemtap-uprobes = "Tom Zanussi <tom.zanussi@intel.com>"
-- 
1.7.4.1

Re: [PATCH 1/3] lttng2-ust: updated to version 2.0.2

[Saul Wold]

On 05/24/2012 12:49 PM, Bogdan Marinescu wrote:
> Tested with 'lttv' on core-image-lsb.
>
> Signed-off-by: Bogdan Marinescu<bogdan.a.marinescu@intel.com>
> ---
>   .../{lttng2-ust_1.9.4.bb =>  lttng2-ust_2.0.2.bb}   |    8 ++++----
>   1 files changed, 4 insertions(+), 4 deletions(-)
>   rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_1.9.4.bb =>  lttng2-ust_2.0.2.bb} (81%)
>
> diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
> similarity index 81%
> rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
> rename to meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
> index 87d866e..8f650a4 100644
> --- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
> +++ b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
> @@ -3,8 +3,8 @@ DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library t
>   HOMEPAGE = "http://lttng.org/lttng2.0"
>   BUGTRACKER = "n/a"
>
> -LICENSE = "LGPLv2.1+&  BSD"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
> +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"
>
> @@ -12,8 +12,8 @@ inherit autotools
>
>   DEPENDS = "liburcu util-linux"
>
> -SRCREV = "eeee05f35f014a8c068e0d29b18629cafbfdfc1d"
> -PV = "1.9.4+git${SRCPV}"
> +SRCREV = "a367ee66aad3ffd21ef64d1b24efc6f862e09562"
> +PV = "2.0.2+git${SRCPV}"
>   PR = "r0"
>
>   SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git"

Merged this series into OE-Core

Thanks
	Sau!