recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng

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.

(From OE-Core rev: 2027fd1bbfc2c136672d5054ba722e9d9d80451d)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

5 files changed, 0 insertions, 170 deletions

diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb b/meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
deleted file mode 100644
index 4223c54db1..0000000000
--- a/meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Babeltrace - Trace Format Babel Tower"
-DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."
-HOMEPAGE = "http://www.efficios.com/babeltrace/"
-BUGTRACKER = "n/a"
-
-LICENSE = "MIT & GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa"
-
-inherit autotools
-
-DEPENDS = "glib-2.0 util-linux popt"
-
-SRCREV = "f6ed7fa4636ff22e08f57721dcd312828547aa66"
-PV = "1.0+git${SRCPV}"
-PR = "r0"
-
-SRC_URI = "git://git.efficios.com/babeltrace.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/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
deleted file mode 100644
index aa24171f31..0000000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-lttng-modules: replace KERNELDIR with KERNEL_SRC
-
-Since lttng-modules uses the default way of module.bbclass to
-build and install lttng-modules, we do this replacement for
-it as-is.
-
-Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
----
- Makefile |    7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5ac13d7..25caad5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -38,17 +38,16 @@ obj-m += lib/
- endif
-
- else
--       KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-        PWD := $(shell pwd)
-        CFLAGS = $(EXTCFLAGS)
-
- default:
--       $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
-+       $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
-
- modules_install:
--       $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
-+       $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
-
- clean:
--       $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
-+       $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
-
- endif
--- 
-1.7.5.4
-
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
deleted file mode 100644
index b3a25f9ca5..0000000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SECTION = "devel"
-SUMMARY = "Linux Trace Toolkit KERNEL MODULE"
-DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules"
-LICENSE = "LGPLv2.1 & GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \
-                    file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
-                    file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad"
-
-DEPENDS = "virtual/kernel"
-
-inherit module
-
-SRCREV = "b945d6c4083ce287f390f54dff4b5e0b73a9f845"
-PV = "2.1.0"
-PR = "r0"
-
-SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
-
-export INSTALL_MOD_DIR="kernel/lttng-modules"
-export KERNEL_SRC="${STAGING_KERNEL_DIR}"
-
-
-S = "${WORKDIR}/git"
-
-# 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/lttng-tools_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
deleted file mode 100644
index 16e1ccc7c7..0000000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
+++ /dev/null
@@ -1,37 +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 = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
-                    file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
-
-DEPENDS = "liburcu popt lttng-ust"
-
-SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
-PV = "v2.1.0"
-PR = "r0"
-
-SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-export KERNELDIR="${STAGING_KERNEL_DIR}"
-
-FILES_${PN} += "${libdir}/lttng/libexec/*"
-FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
-
-# Since files are installed into ${libdir}/lttng/libexec we match 
-# the libexec insane test so skip it.
-INSANE_SKIP_${PN} = "libexec"
-INSANE_SKIP_${PN}-dbg = "libexec"
-
-# 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/lttng-ust_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
deleted file mode 100644
index 1076bde574..0000000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
+++ /dev/null
@@ -1,35 +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 & 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
-
-DEPENDS = "liburcu util-linux"
-
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "lttng2-ust"
-RREPLACES_${PN} = "lttng2-ust"
-RCONFLICTS_${PN} = "lttng2-ust"
-
-SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19"
-PV = "2.1.0"
-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.*'