From 2279700bf90e27c08595d433a26425bcc0c7ba9a Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 13 Feb 2015 14:44:29 +0000
Subject: lttng-ust: 2.5.2 -> 2.6.0

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-kernel/lttng/lttng-ust_2.5.2.bb | 33 ----------------------------
 meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb | 33 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.5.2.bb
 create mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb

diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.5.2.bb b/meta/recipes-kernel/lttng/lttng-ust_2.5.2.bb
deleted file mode 100644
index eda52bb81f..0000000000
--- a/meta/recipes-kernel/lttng/lttng-ust_2.5.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x"
-DESCRIPTION = "The LTTng UST 2.x 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+ & MIT & 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 lib_package
-
-DEPENDS = "liburcu util-linux"
-RDEPENDS_${PN}-bin = "python-core"
-
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "lttng2-ust"
-RREPLACES_${PN} = "lttng2-ust"
-RCONFLICTS_${PN} = "lttng2-ust"
-
-SRCREV = "85d1d2791f3cebfd741a821261bf2924928a90e7"
-PE = "2"
-
-SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.5 \
-           file://lttng-ust-doc-examples-disable.patch \
-           file://add-aarch64.patch \
-	   "
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-	( cd ${S}; ${S}/bootstrap )
-}
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb
new file mode 100644
index 0000000000..080e7448b2
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x"
+DESCRIPTION = "The LTTng UST 2.x 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+ & MIT & 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 lib_package
+
+DEPENDS = "liburcu util-linux"
+RDEPENDS_${PN}-bin = "python-core"
+
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "lttng2-ust"
+RREPLACES_${PN} = "lttng2-ust"
+RCONFLICTS_${PN} = "lttng2-ust"
+
+SRCREV = "5748584c5ae8ca5c4da26f41b6c61bb816e6d50b"
+PE = "2"
+
+SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \
+           file://lttng-ust-doc-examples-disable.patch \
+           file://add-aarch64.patch \
+	   "
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend () {
+	( cd ${S}; ${S}/bootstrap )
+}
-- 
cgit 1.2.3-korg