From 38bf4fc828652ba5daeaaf53afca5c1d404bf6d9 Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Mon, 21 Jun 2010 05:31:04 -0700
Subject: lttng-control: upgrade from 0.67 to 0.87

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../lttng/lttng-control-0.43/build_fix.patch       | 16 --------
 .../lttng/lttng-control-0.43/dynticks.patch        | 43 ----------------------
 meta/packages/lttng/lttng-control_0.67.bb          | 19 ----------
 meta/packages/lttng/lttng-control_0.87.bb          | 19 ++++++++++
 4 files changed, 19 insertions(+), 78 deletions(-)
 delete mode 100644 meta/packages/lttng/lttng-control-0.43/build_fix.patch
 delete mode 100644 meta/packages/lttng/lttng-control-0.43/dynticks.patch
 delete mode 100644 meta/packages/lttng/lttng-control_0.67.bb
 create mode 100644 meta/packages/lttng/lttng-control_0.87.bb

diff --git a/meta/packages/lttng/lttng-control-0.43/build_fix.patch b/meta/packages/lttng/lttng-control-0.43/build_fix.patch
deleted file mode 100644
index 58e3d906e..000000000
--- a/meta/packages/lttng/lttng-control-0.43/build_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- facilities/Makefile.am |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: ltt-control-0.43-10082007/facilities/Makefile.am
-===================================================================
---- ltt-control-0.43-10082007.orig/facilities/Makefile.am	2007-08-24 17:30:56.000000000 +0100
-+++ ltt-control-0.43-10082007/facilities/Makefile.am	2007-08-24 17:31:07.000000000 +0100
-@@ -43,7 +43,6 @@ stack_arch_x86_64.xml \
- list.xml \
- user_generic.xml \
- xen.xml \
--compact.xml \
- block.xml
- 
- 
diff --git a/meta/packages/lttng/lttng-control-0.43/dynticks.patch b/meta/packages/lttng/lttng-control-0.43/dynticks.patch
deleted file mode 100644
index c9bf2e9be..000000000
--- a/meta/packages/lttng/lttng-control-0.43/dynticks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: ltt-control-0.6-28042006/facilities/dynticks.xml
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ltt-control-0.6-28042006/facilities/dynticks.xml	2006-06-05 18:03:41.000000000 +0100
-@@ -0,0 +1,18 @@
-+<?xml version="1.0"?>
-+<facility name="dynticks">
-+    <description>Dynamic Timer Events</description>
-+    
-+  <event name="handler_entry">
-+    <description>Dynticks Handler Entered</description>
-+  </event>  
-+  
-+  <event name="handler_exit">
-+    <description>Dynticks Handler Exitted</description>
-+  </event> 
-+
-+  <event name="reprogram">
-+    <description>Dynticks Reprogram</description>
-+    <field name="ticks"><description>Number of ticks to sleep for</description><uint size="4"></field>
-+  </event> 
-+
-+</facility>
-Index: ltt-control-0.6-28042006/facilities/Makefile.am
-===================================================================
---- ltt-control-0.6-28042006.orig/facilities/Makefile.am	2006-04-28 21:26:26.000000000 +0100
-+++ ltt-control-0.6-28042006/facilities/Makefile.am	2006-06-05 18:04:30.000000000 +0100
-@@ -1,6 +1,7 @@
- 
- EXTRA_DIST =  \
- core.xml \
-+dynticks.xml \
- fs.xml \
- ipc.xml \
- kernel.xml \
-@@ -21,6 +22,7 @@
- 
- facilities_DATA = \
- core.xml \
-+dynticks.xml \
- fs.xml \
- ipc.xml \
- kernel.xml \
diff --git a/meta/packages/lttng/lttng-control_0.67.bb b/meta/packages/lttng/lttng-control_0.67.bb
deleted file mode 100644
index 38b5da4d8..000000000
--- a/meta/packages/lttng/lttng-control_0.67.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "devel"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and  \
-interpret them."
-LICENSE = "GPL"
-
-LTTDATE = "05032009"
-
-SRC_URI = "http://ltt.polymtl.ca/files/lttng/ltt-control-${PV}-${LTTDATE}.tar.gz"
-#           file://build_fix.patch;patch=1 \
-#           file://dynticks.patch;patch=1
-
-S = "${WORKDIR}/ltt-control-${PV}-${LTTDATE}"
-
-inherit autotools
-
-export KERNELDIR="${STAGING_KERNEL_DIR}"
-
-FILES_${PN} += "${datadir}/ltt-control/facilities/*"	    
\ No newline at end of file
diff --git a/meta/packages/lttng/lttng-control_0.87.bb b/meta/packages/lttng/lttng-control_0.87.bb
new file mode 100644
index 000000000..d48234a17
--- /dev/null
+++ b/meta/packages/lttng/lttng-control_0.87.bb
@@ -0,0 +1,19 @@
+SECTION = "devel"
+DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
+extract program execution details from the Linux operating system and  \
+interpret them."
+LICENSE = "GPL"
+
+RP = "r0"
+
+LTTDATE = "09062010"
+
+SRC_URI = "http://ltt.polymtl.ca/files/lttng/ltt-control-${PV}-${LTTDATE}.tar.gz"
+
+S = "${WORKDIR}/ltt-control-${PV}-${LTTDATE}"
+
+inherit autotools
+
+export KERNELDIR="${STAGING_KERNEL_DIR}"
+
+FILES_${PN} += "${datadir}/ltt-control/facilities/*"	    
-- 
cgit v1.2.3