summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-05-23 10:14:56 +0000
committerRichard Purdie <richard@openedhand.com>2006-05-23 10:14:56 +0000
commit632eaf43e31e0b3f9165f341555642de3defe291 (patch)
tree35fba955dbe5037e74dc6d3e11d172dafed9fb6f
parentd9fe26c2a32ace4fa8147fbf4c2880e5d7e459f7 (diff)
downloadpoky-632eaf43e31e0b3f9165f341555642de3defe291.tar.gz
lttng: Update lttng-control 0.1 -> 0.6, lttng-viewer 0.34 -> 0.41 and remove now unneeded lttng-modules
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@414 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--openembedded/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch134
-rw-r--r--openembedded/packages/lttng/lttng-control_0.1.bb14
-rw-r--r--openembedded/packages/lttng/lttng-control_0.6.bb33
-rw-r--r--openembedded/packages/lttng/lttng-modules-0.12/ltt-modules-fixes.patch59
-rw-r--r--openembedded/packages/lttng/lttng-modules_0.12.bb22
-rw-r--r--openembedded/packages/lttng/lttng-viewer_0.8.41-20060512.bb (renamed from openembedded/packages/lttng/lttng-viewer_0.8.34-20060317.bb)2
6 files changed, 168 insertions, 96 deletions
diff --git a/openembedded/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch b/openembedded/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch
new file mode 100644
index 0000000000..f1e45ac159
--- /dev/null
+++ b/openembedded/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch
@@ -0,0 +1,134 @@
1Index: ltt-control-0.6-28042006/liblttctl/liblttctl.c
2===================================================================
3--- ltt-control-0.6-28042006.orig/liblttctl/liblttctl.c 2006-03-11 17:30:32.000000000 +0000
4+++ ltt-control-0.6-28042006/liblttctl/liblttctl.c 2006-05-12 11:21:13.000000000 +0100
5@@ -298,7 +298,7 @@
6
7
8 int lttctl_create_trace(const struct lttctl_handle *h,
9- char *name, enum trace_mode mode, unsigned subbuf_size, unsigned n_subbufs)
10+ char *name, enum trace_mode mode, enum ltt_trace_type type, unsigned subbuf_size, unsigned n_subbufs)
11 {
12 int err;
13
14@@ -324,6 +324,7 @@
15 req.msg.args.new_trace.mode = mode;
16 req.msg.args.new_trace.subbuf_size = subbuf_size;
17 req.msg.args.new_trace.n_subbufs = n_subbufs;
18+ req.msg.args.new_trace.type = type;
19
20 err = lttctl_netlink_sendto(h, (void *)&req, req.nlh.nlmsg_len);
21 if(err < 0) goto senderr;
22Index: ltt-control-0.6-28042006/liblttctl/lttctl.h
23===================================================================
24--- ltt-control-0.6-28042006.orig/liblttctl/lttctl.h 2006-03-11 17:30:32.000000000 +0000
25+++ ltt-control-0.6-28042006/liblttctl/lttctl.h 2006-05-12 11:20:46.000000000 +0100
26@@ -45,6 +45,12 @@
27 LTT_TRACE_FLIGHT
28 };
29
30+enum ltt_trace_type {
31+ LTT_TYPE_RELAYFS,
32+ LTT_TYPE_STI,
33+ LTT_TYPE_STIRELAYFS
34+};
35+
36 typedef struct lttctl_peer_msg {
37 char trace_name[NAME_MAX];
38 enum trace_op op;
39@@ -53,6 +59,7 @@
40 enum trace_mode mode;
41 unsigned subbuf_size;
42 unsigned n_subbufs;
43+ enum ltt_trace_type type;
44 } new_trace;
45 } args;
46 } lttctl_peer_msg_t;
47@@ -76,7 +83,7 @@
48
49
50 int lttctl_create_trace(const struct lttctl_handle *h,
51- char *name, enum trace_mode mode, unsigned subbuf_size, unsigned n_subbufs);
52+ char *name, enum trace_mode mode, enum ltt_trace_type type, unsigned subbuf_size, unsigned n_subbufs);
53
54 int lttctl_destroy_trace(const struct lttctl_handle *handle, char *name);
55
56Index: ltt-control-0.6-28042006/lttctl/lttctl.c
57===================================================================
58--- ltt-control-0.6-28042006.orig/lttctl/lttctl.c 2006-03-11 17:30:27.000000000 +0000
59+++ ltt-control-0.6-28042006/lttctl/lttctl.c 2006-05-12 11:19:53.000000000 +0100
60@@ -40,11 +40,13 @@
61 };
62
63 static char *trace_name = NULL;
64+static char *trace_type = NULL;
65 static char *mode_name = NULL;
66 static unsigned subbuf_size = 0;
67 static unsigned n_subbufs = 0;
68 static unsigned append_trace = 0;
69 static enum trace_mode mode = LTT_TRACE_NORMAL;
70+static enum ltt_trace_type type = LTT_TYPE_RELAYFS;
71 static enum trace_ctl_op op = CTL_OP_NONE;
72 static char *channel_root = NULL;
73 static char *trace_root = NULL;
74@@ -81,6 +83,7 @@
75 printf(" (optionnaly, you can set LTT_DAEMON\n");
76 printf(" and the LTT_FACILITIES env. vars.)\n");
77 printf("-t Trace root path. (ex. /root/traces/example_trace)\n");
78+ printf("-T Type of trace (ex. relayfs, sti, stirelayfs)\n");
79 printf("-l LTT channels root path. (ex. /mnt/relayfs/ltt)\n");
80 printf("-z Size of the subbuffers (will be rounded to next page size)\n");
81 printf("-x Number of subbuffers\n");
82@@ -217,6 +220,27 @@
83 argn++;
84 }
85 break;
86+ case 'T':
87+ if(argn+1 < argc) {
88+ trace_type = argv[argn+1];
89+ argn++;
90+ if(strcmp(trace_type, "relayfs") == 0)
91+ type = LTT_TYPE_RELAYFS;
92+ else if(strcmp(trace_type, "sti") == 0)
93+ type = LTT_TYPE_STI;
94+ else if(strcmp(trace_type, "stirelayfs") == 0)
95+ type = LTT_TYPE_STIRELAYFS;
96+ else {
97+ printf("Invalid trace type '%s'.\n", argv[argn]);
98+ printf("\n");
99+ ret = EINVAL;
100+ }
101+ } else {
102+ printf("Specify a trace type after -T.\n");
103+ printf("\n");
104+ ret = EINVAL;
105+ }
106+ break;
107 default:
108 printf("Invalid argument '%s'.\n", argv[argn]);
109 printf("\n");
110@@ -390,7 +414,7 @@
111 strcat(channel_path, trace_name);
112
113
114- ret = lttctl_create_trace(handle, trace_name, mode, subbuf_size, n_subbufs);
115+ ret = lttctl_create_trace(handle, trace_name, mode, type, subbuf_size, n_subbufs);
116 if(ret != 0) goto create_error;
117
118 act.sa_handler = sigchld_handler;
119@@ -466,13 +490,13 @@
120
121 switch(op) {
122 case CTL_OP_CREATE_START:
123- ret = lttctl_create_trace(handle, trace_name, mode, subbuf_size,
124+ ret = lttctl_create_trace(handle, trace_name, mode, type, subbuf_size,
125 n_subbufs);
126 if(!ret)
127 ret = lttctl_start(handle, trace_name);
128 break;
129 case CTL_OP_CREATE:
130- ret = lttctl_create_trace(handle, trace_name, mode, subbuf_size,
131+ ret = lttctl_create_trace(handle, trace_name, mode, type, subbuf_size,
132 n_subbufs);
133 break;
134 case CTL_OP_DESTROY:
diff --git a/openembedded/packages/lttng/lttng-control_0.1.bb b/openembedded/packages/lttng/lttng-control_0.1.bb
deleted file mode 100644
index 018187741b..0000000000
--- a/openembedded/packages/lttng/lttng-control_0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SECTION = "devel"
2DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
3extract program execution details from the Linux operating system and \
4interpret them."
5LICENSE = "GPL"
6MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
7
8SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-11032006.tar.gz"
9
10S = "${WORKDIR}/ltt-control-${PV}-11032006"
11
12inherit autotools
13
14FILES_${PN} += "${datadir}/ltt-control/facilities/*" \ No newline at end of file
diff --git a/openembedded/packages/lttng/lttng-control_0.6.bb b/openembedded/packages/lttng/lttng-control_0.6.bb
new file mode 100644
index 0000000000..e266ea5e91
--- /dev/null
+++ b/openembedded/packages/lttng/lttng-control_0.6.bb
@@ -0,0 +1,33 @@
1SECTION = "devel"
2DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
3extract program execution details from the Linux operating system and \
4interpret them."
5LICENSE = "GPL"
6MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
7
8SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-28042006.tar.gz"
9
10S = "${WORKDIR}/ltt-control-${PV}-28042006"
11
12inherit autotools
13#inherit module
14
15export KERNELDIR="${STAGING_KERNEL_DIR}"
16
17#INHIBIT_PACKAGE_STRIP = "1"
18#EXTRA_OECONF = "--without-rtai \
19# --without-gtk"
20
21#do_configure () {
22# rm -f ${S}/acinclude.m4
23# autotools_do_configure
24#}
25
26#o_install() {
27# install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
28# install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
29#
30
31
32#ILES = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"
33FILES_${PN} += "${datadir}/ltt-control/facilities/*" \ No newline at end of file
diff --git a/openembedded/packages/lttng/lttng-modules-0.12/ltt-modules-fixes.patch b/openembedded/packages/lttng/lttng-modules-0.12/ltt-modules-fixes.patch
deleted file mode 100644
index 68abc7dda4..0000000000
--- a/openembedded/packages/lttng/lttng-modules-0.12/ltt-modules-fixes.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1Index: ltt-modules-0.12/ltt-statedump.c
2===================================================================
3--- ltt-modules-0.12.orig/ltt-statedump.c 2006-03-09 19:33:38.000000000 +0000
4+++ ltt-modules-0.12/ltt-statedump.c 2006-03-22 12:43:30.000000000 +0000
5@@ -19,8 +19,14 @@
6 #include <linux/proc_fs.h>
7 #include <linux/file.h>
8 #include <linux/interrupt.h>
9-#include <linux/irq.h>
10 #include <linux/ltt/ltt-facility-statedump.h>
11+#ifndef CONFIG_ARM
12+#include <linux/irq.h>
13+#else
14+#include <asm/mach/irq.h>
15+#endif
16+
17+
18
19 #define NB_PROC_CHUNK 20
20
21@@ -160,6 +166,7 @@
22 return 0;
23 }
24
25+#ifndef CONFIG_ARM
26 static inline int ltt_enumerate_interrupts(void)
27 {
28 unsigned int i;
29@@ -182,7 +189,9 @@
30
31 return 0;
32 }
33-
34+#else
35+#define ltt_enumerate_interrupts(x)
36+#endif
37
38 static inline int ltt_enumerate_process_states(void)
39 {
40Index: ltt-modules-0.12/Makefile
41===================================================================
42--- ltt-modules-0.12.orig/Makefile 2006-03-11 18:16:17.000000000 +0000
43+++ ltt-modules-0.12/Makefile 2006-03-22 12:39:44.000000000 +0000
44@@ -1,9 +1,7 @@
45-ifneq ($(KERNELRELEASE),)
46 ifneq ($(CONFIG_LTT),)
47 obj-m := ltt-control.o ltt-statedump.o
48 endif
49
50-else
51 KERNELDIR ?= /lib/modules/$(shell uname -r)/build
52 PWD := $(shell pwd)
53 KERNELRELEASE = $(shell cat $(KERNELDIR)/$(KBUILD_OUTPUT)/include/linux/version.h | sed -n 's/.*UTS_RELEASE.*\"\(.*\)\".*/\1/p')
54@@ -21,4 +19,4 @@
55
56 clean:
57 $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
58-endif
59+
diff --git a/openembedded/packages/lttng/lttng-modules_0.12.bb b/openembedded/packages/lttng/lttng-modules_0.12.bb
deleted file mode 100644
index 51f6a05ec1..0000000000
--- a/openembedded/packages/lttng/lttng-modules_0.12.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SECTION = "devel"
2DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
3extract program execution details from the Linux operating system and \
4interpret them."
5LICENSE = "GPL"
6MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
7
8SRC_URI = "http://ltt.polymtl.ca/lttng/${PN}-${PV}.tar.gz \
9 file://ltt-modules-fixes.patch;patch=1"
10
11S = "${WORKDIR}/ltt-modules-${PV}"
12
13inherit module
14
15export KERNELDIR="${STAGING_KERNEL_DIR}"
16
17do_install() {
18 install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
19 install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
20}
21
22FILES = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"
diff --git a/openembedded/packages/lttng/lttng-viewer_0.8.34-20060317.bb b/openembedded/packages/lttng/lttng-viewer_0.8.41-20060512.bb
index b76f8b8116..c6069bc794 100644
--- a/openembedded/packages/lttng/lttng-viewer_0.8.34-20060317.bb
+++ b/openembedded/packages/lttng/lttng-viewer_0.8.41-20060512.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Richrd Purdie <richard@openedhand.com>"
7PR = "r1" 7PR = "r1"
8DEPENDS = "gtk+ pango popt" 8DEPENDS = "gtk+ pango popt"
9 9
10ALTNAME = "LinuxTraceToolkitViewer-0.8.34-17032006" 10ALTNAME = "LinuxTraceToolkitViewer-0.8.41-12052006"
11 11
12SRC_URI = "http://ltt.polymtl.ca/packages/${ALTNAME}.tar.gz " 12SRC_URI = "http://ltt.polymtl.ca/packages/${ALTNAME}.tar.gz "
13S = "${WORKDIR}/${ALTNAME}" 13S = "${WORKDIR}/${ALTNAME}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-24 05:16:13 +0000