From fb7eeb395402ce6ec923cd4be411de2ddbe61310 Mon Sep 17 00:00:00 2001
From: Lianhao Lu <lianhao.lu@intel.com>
Date: Wed, 21 Mar 2012 17:41:07 +0800
Subject: lttng-2.0/lttng-ust: Change recipe name to lttng2-ust.

Change the recipe name lttng-ust from lttng-2.0 to lttng2-ust so that
that both the lttng-ust of the old framework and of the new framework
lttng-2.0 can coexist.

Fixed bug [YOCTO #2062].

(From OE-Core rev: 0d9fc8185945328837aa1a3d9d705afa56856853)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../lttng-2.0/lttng-tools_2.0-pre16.bb             |  2 +-
 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb   | 30 ----------------------
 meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb  | 30 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
 create mode 100644 meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb

(limited to 'meta/recipes-kernel/lttng-2.0')

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-pre16.bb
index fdebc0e6c2..d3a6a30706 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-pre16.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ab682a4729389c3f11913d758affe98e \
                     file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
 
-DEPENDS = "liburcu popt lttng-ust"
+DEPENDS = "liburcu popt lttng2-ust"
 
 SRCREV = "9beed4cb465347c778e4f982c330cef78f2628b7"
 PV = "v2.0.pre16+git${SRCREV}"
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb b/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
deleted file mode 100644
index 87d866e008..0000000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
+++ /dev/null
@@ -1,30 +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/lttng2.0"
-BUGTRACKER = "n/a"
-
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
-                    file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
-                    file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
-
-inherit autotools
-
-DEPENDS = "liburcu util-linux"
-
-SRCREV = "eeee05f35f014a8c068e0d29b18629cafbfdfc1d"
-PV = "1.9.4+git${SRCPV}"
-PR = "r0"
-
-SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-	${S}/bootstrap
-}
-
-# 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.
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb b/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
new file mode 100644
index 0000000000..87d866e008
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
@@ -0,0 +1,30 @@
+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/lttng2.0"
+BUGTRACKER = "n/a"
+
+LICENSE = "LGPLv2.1+ & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+                    file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
+                    file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
+
+inherit autotools
+
+DEPENDS = "liburcu util-linux"
+
+SRCREV = "eeee05f35f014a8c068e0d29b18629cafbfdfc1d"
+PV = "1.9.4+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend () {
+	${S}/bootstrap
+}
+
+# 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.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
-- 
cgit v1.2.3-54-g00ecf