Message ID | 0a5b86223b8cbf0da5bfe8ae12d732c2c4fdf104.1361970483.git.kibo@prevas.dk |
---|---|
State | Accepted |
Delegated to: | Esben Haabendal |
Headers | show |
Kim Bøndergaard <kibo@prevas.dk> writes: > --- > .../lttng/lttng-tools-2.0.4/modprobe-short-options.patch | 14 -------------- > recipes/lttng/lttng-tools_2.0.4.oe | 16 ---------------- > recipes/lttng/lttng-tools_2.0.4.oe.sig | 1 - > 3 files changed, 31 deletions(-) > delete mode 100644 recipes/lttng/lttng-tools-2.0.4/modprobe-short-options.patch > delete mode 100644 recipes/lttng/lttng-tools_2.0.4.oe > delete mode 100644 recipes/lttng/lttng-tools_2.0.4.oe.sig > > diff --git a/recipes/lttng/lttng-tools-2.0.4/modprobe-short-options.patch b/recipes/lttng/lttng-tools-2.0.4/modprobe-short-options.patch > deleted file mode 100644 > index 8f38328..0000000 > --- a/recipes/lttng/lttng-tools-2.0.4/modprobe-short-options.patch > +++ /dev/null > @@ -1,14 +0,0 @@ > ---- lttng-tools-2.0.4/src/bin/lttng-sessiond/main.c~orig 2012-11-02 08:34:45.061277553 +0100 > -+++ lttng-tools-2.0.4/src/bin/lttng-sessiond/main.c 2012-11-02 08:35:02.373277409 +0100 > -@@ -1664,9 +1664,9 @@ > - * Exec consumerd. > - */ > - if (opt_verbose_consumer) { > -- verbosity = "--verbose"; > -+ verbosity = "-v"; > - } else { > -- verbosity = "--quiet"; > -+ verbosity = "-q"; > - } > - switch (consumer_data->type) { > - case LTTNG_CONSUMER_KERNEL: > diff --git a/recipes/lttng/lttng-tools_2.0.4.oe b/recipes/lttng/lttng-tools_2.0.4.oe > deleted file mode 100644 > index 53bc557..0000000 > --- a/recipes/lttng/lttng-tools_2.0.4.oe > +++ /dev/null > @@ -1,16 +0,0 @@ > -require ${PN}.inc > - > -SRC_URI += "file://modprobe-short-options.patch" > - > -inherit auto-package-libs > -AUTO_PACKAGE_LIBS = "lttng-ctl" > -FILES_${PN}-liblttng-ctl = "${libdir}/lttng/libexec" > -FILES_${PN}-liblttng-ctl-dev = "${includedir}/lttng/lttng.h" > -DEPENDS_${PN}-liblttngctl = "libgcc libc libdl librt libpthread \ > - liburcu libuuid libpopt lttng-ust lttng-ust-dev" > - > -inherit auto-package-utils > -AUTO_PACKAGE_UTILS = "lttng ltt-sessiond" > -RDEPENDS_${PN}-lttng = "liblttngctl libpopt libpthread libc" > -RDEPENDS_${PN}-ltt-sessiond = "liblttngctl libpopt libpthread librt libc" > -RDEPENDS_${PN} += "${AUTO_PACKAGE_UTILS_PACKAGES}" > diff --git a/recipes/lttng/lttng-tools_2.0.4.oe.sig b/recipes/lttng/lttng-tools_2.0.4.oe.sig > deleted file mode 100644 > index b4bddf0..0000000 > --- a/recipes/lttng/lttng-tools_2.0.4.oe.sig > +++ /dev/null > @@ -1 +0,0 @@ > -ff0dc413c7cb7733237d6b9ca6a542a463d42e19 lttng-tools-2.0.4.tar.bz2 Merged to master, thanks. /Esben
diff --git a/recipes/lttng/lttng-tools-2.0.4/modprobe-short-options.patch b/recipes/lttng/lttng-tools-2.0.4/modprobe-short-options.patch deleted file mode 100644 index 8f38328..0000000 --- a/recipes/lttng/lttng-tools-2.0.4/modprobe-short-options.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lttng-tools-2.0.4/src/bin/lttng-sessiond/main.c~orig 2012-11-02 08:34:45.061277553 +0100 -+++ lttng-tools-2.0.4/src/bin/lttng-sessiond/main.c 2012-11-02 08:35:02.373277409 +0100 -@@ -1664,9 +1664,9 @@ - * Exec consumerd. - */ - if (opt_verbose_consumer) { -- verbosity = "--verbose"; -+ verbosity = "-v"; - } else { -- verbosity = "--quiet"; -+ verbosity = "-q"; - } - switch (consumer_data->type) { - case LTTNG_CONSUMER_KERNEL: diff --git a/recipes/lttng/lttng-tools_2.0.4.oe b/recipes/lttng/lttng-tools_2.0.4.oe deleted file mode 100644 index 53bc557..0000000 --- a/recipes/lttng/lttng-tools_2.0.4.oe +++ /dev/null @@ -1,16 +0,0 @@ -require ${PN}.inc - -SRC_URI += "file://modprobe-short-options.patch" - -inherit auto-package-libs -AUTO_PACKAGE_LIBS = "lttng-ctl" -FILES_${PN}-liblttng-ctl = "${libdir}/lttng/libexec" -FILES_${PN}-liblttng-ctl-dev = "${includedir}/lttng/lttng.h" -DEPENDS_${PN}-liblttngctl = "libgcc libc libdl librt libpthread \ - liburcu libuuid libpopt lttng-ust lttng-ust-dev" - -inherit auto-package-utils -AUTO_PACKAGE_UTILS = "lttng ltt-sessiond" -RDEPENDS_${PN}-lttng = "liblttngctl libpopt libpthread libc" -RDEPENDS_${PN}-ltt-sessiond = "liblttngctl libpopt libpthread librt libc" -RDEPENDS_${PN} += "${AUTO_PACKAGE_UTILS_PACKAGES}" diff --git a/recipes/lttng/lttng-tools_2.0.4.oe.sig b/recipes/lttng/lttng-tools_2.0.4.oe.sig deleted file mode 100644 index b4bddf0..0000000 --- a/recipes/lttng/lttng-tools_2.0.4.oe.sig +++ /dev/null @@ -1 +0,0 @@ -ff0dc413c7cb7733237d6b9ca6a542a463d42e19 lttng-tools-2.0.4.tar.bz2