Patchwork [1/5] lttng: remove 'legacy' lttng

login
register
mail settings
Submitter Tom Zanussi
Date Jan. 11, 2013, 7:20 p.m.
Message ID <88b78152fff010082e07b57992977e0b9d65fdde.1357930527.git.tom.zanussi@intel.com>
Download mbox | patch
Permalink /patch/42509/
State New
Headers show

Comments

Tom Zanussi - Jan. 11, 2013, 7:20 p.m.
From: Tom Zanussi <tom.zanussi@intel.com>

This removes 'legacy' lttng - it hasn't actually worked for awhile
now, and has been replaced by equivalent functionality in
recipes-kernel/lttng-2.0 (which will be renamed to lttng in a
follow-up patch).

Fixes [YOCTO #3303].

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/recipes-kernel/lttng/lttng-control_0.89.bb    | 23 ------------
 meta/recipes-kernel/lttng/lttng-ust_0.16.bb        | 32 -----------------
 .../lttng-viewer/add_linkage_to_lttvwindow.patch   | 42 ----------------------
 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb  | 40 ---------------------
 4 files changed, 137 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
 delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
Tom Zanussi - Jan. 11, 2013, 10:12 p.m.
From: Tom Zanussi <tom.zanussi@intel.com>

recipes-kernel/lttng was removed by a previous patch, which also
removed the naming conflict that caused the lttng-2.0 version of lttng
to be named recipes-kernel/lttng-2.0.  Since the naming conflict has
disappeared, we can go back to the simpler naming.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb              | 0
 .../lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch   | 0
 meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb           | 0
 meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb             | 0
 meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb               | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
 rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch (100%)
 rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
 rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (100%)
 rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb (100%)

diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb b/meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
rename to meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-control_0.89.bb b/meta/recipes-kernel/lttng/lttng-control_0.89.bb
deleted file mode 100644
index 77314c8..0000000
--- a/meta/recipes-kernel/lttng/lttng-control_0.89.bb
+++ /dev/null
@@ -1,23 +0,0 @@ 
-SECTION = "devel"
-SUMMARY = "Linux Trace Toolkit Control"
-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 = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r0"
-
-LTTDATE = "05122011"
-
-SRC_URI = "http://lttng.org/files/lttng/ltt-control-${PV}-${LTTDATE}.tar.gz"
-
-SRC_URI[md5sum] = "2e5a531bf5cab88eef5282b45271789f"
-SRC_URI[sha256sum] = "feb120e0bedd9ef8917dd14ee96cc94941f517826a4c2035d1c4aa33e4e808ab"
-
-S = "${WORKDIR}/ltt-control-${PV}-${LTTDATE}"
-
-inherit autotools
-
-export KERNELDIR="${STAGING_KERNEL_DIR}"
-
-FILES_${PN} += "${datadir}/ltt-control/facilities/*"	    
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
deleted file mode 100644
index 3618a2d..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
+++ /dev/null
@@ -1,32 +0,0 @@ 
-SUMMARY = "Linux Trace Toolkit Userspace Tracer"
-DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code"
-HOMEPAGE = "http://lttng.org/ust"
-BUGTRACKER = "http://lttng.org/project/issues"
-
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
-                    file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
-                    file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
-
-DEPENDS = "liburcu"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8e5d5de47bfff29f50439d192ad1e478"
-SRC_URI[sha256sum] = "88167741b1fbf335e006f0208d8c41784705e28adac84df71d3d9f6c58191dab"
-
-
-S = "${WORKDIR}/ust-${PV}"
-
-inherit autotools
-
-#EXTRA_OECONF = "ac_cv_lib_urcu_bp_synchronize_rcu_bp=no"
-
-# Due to liburcu not building on 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/lttng-viewer/add_linkage_to_lttvwindow.patch b/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
deleted file mode 100644
index 4a135df..0000000
--- a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
+++ /dev/null
@@ -1,42 +0,0 @@ 
-Upstream-Status: Inappropriate [configuration]
-
-Explicitly add linkage to lttvwindow.
-
-Without the fix, lttv-gui inside target can't run, complaining
-"undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
-
-Tue May  3 21:39:37 CST 2011
-
-Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-
-diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am
-index ce50113..89083aa 100644
---- a/lttv/modules/gui/common.am
-+++ b/lttv/modules/gui/common.am
-@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS)
- 
- libdir = ${lttvplugindir}
- 
-+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
-diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-index c953fc9..489d640 100644
---- a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-+++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-@@ -1,13 +1,14 @@
- ## Process this file with automake to produce Makefile.in
- 
--include ../../common.am
--
- INCLUDES = \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- 	$(DEFAULT_INCLUDES)
- 
--#libdir = ${lttvplugindir}
-+AM_CFLAGS = $(MODULE_CFLAGS)
-+AM_LDFLAGS = $(MODULE_LDFLAGS)
-+
-+libdir = ${lttvplugindir}
- 
- lib_LTLIBRARIES = liblttvwindow.la
- 
diff --git a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb b/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
deleted file mode 100644
index 9d94903..0000000
--- a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
+++ /dev/null
@@ -1,40 +0,0 @@ 
-SUMMARY = "Linux Trace Toolkit Viewer"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and  \
-interpret them."
-HOMEPAGE = "http://lttng.org/content/download"
-BUGTRACKER = "n/a"
-
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f650d5f5af1e9648fe0b40e290d3adbb \
-                    file://ltt/ltt.h;beginline=2;endline=18;md5=8b7da9190028c50396d97fc85bad0da9 \
-                    file://lttv/lttv/traceset.c;beginline=2;endline=17;md5=bcab42863b64b41d153bf81bbe2490a6"
-PR = "r3"
-
-DEPENDS = "gtk+ pango popt"
-
-SECTION = "devel"
-
-ALTNAME = "lttv-${PV}-21032011"
-
-SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz \
-           file://add_linkage_to_lttvwindow.patch"
-
-SRC_URI[md5sum] = "071bf3dd13e7562c08ee8f8971cfc76d"
-SRC_URI[sha256sum] = "cf87ffcf5d266b18979418e610a180a0b4214de41677f0be867885e15b2f7647"
-S = "${WORKDIR}/${ALTNAME}"
-
-inherit autotools
-
-LEAD_SONAME = "liblttvtraceread*"
-
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "\
-    ${libdir}/liblttvtraceread*.so \
-    ${libdir}/lttv/plugins/*.so \
-    ${datadir}/lttv/facilities/* \
-    ${datadir}/lttv/pixmaps/* "
-FILES_${PN}-dbg += "${libdir}/lttv/plugins/.debug/"
-FILES_${PN}-dev += "${libdir}/lttv/plugins/*.la"
-FILES_${PN}-staticdev += "${libdir}/lttv/plugins/*.a"
-INSANE_SKIP_${PN} = "dev-so"