trace-cmd: update to latest version

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36643

diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile
index 1d555db4d42afcea06bb553f1ff55a7d5417985b..5263841aac00f6c098b7c59156a8a729ef17409e 100644 (file)
--- a/package/devel/trace-cmd/Makefile
+++ b/package/devel/trace-cmd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=trace-cmd
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=trace-cmd

-PKG_VERSION:=v2.0.1
+PKG_VERSION:=v2.2.1

 PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_SOURCE_VERSION:=1776cf9a24f95b2623fe7ee380d708bb8c6d8a73
+PKG_SOURCE_VERSION:=8c10a774f1f8586cd8b0e3ce8666a376cb1d98e3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 # PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620
 PKG_INSTALL:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 # PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620
 PKG_INSTALL:=1

diff --git a/package/devel/trace-cmd/patches/100-compile_fix.patch b/package/devel/trace-cmd/patches/100-compile_fix.patch
index 151c123b413ca5ad47509fa5d8b011787e15556f..d0f34f93ffdf10bdcf00d9be1610d942b68cdecd 100644 (file)
--- a/package/devel/trace-cmd/patches/100-compile_fix.patch
+++ b/package/devel/trace-cmd/patches/100-compile_fix.patch
@@ -1,13 +1,3 @@
---- a/event-utils.h
-+++ b/event-utils.h
-@@ -22,6 +22,7 @@
- 
- #include <string.h>
- #include <ctype.h>
-+#include <stdarg.h>
- 
- /* Can be overridden */
- void die(const char *fmt, ...);

 --- a/trace-listen.c
 +++ b/trace-listen.c
 @@ -17,6 +17,7 @@
 --- a/trace-listen.c
 +++ b/trace-listen.c
 @@ -17,6 +17,7 @@

diff --git a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch b/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch
deleted file mode 100644 (file)
index c0af0c6..0000000
--- a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/trace-util.c
-+++ b/trace-util.c
-@@ -110,7 +110,7 @@ void parse_cmdlines(struct pevent *peven
- 
-       line = strtok_r(file, "\n", &next);
-       while (line) {
--              sscanf(line, "%d %as", &pid,
-+              sscanf(line, "%d %ms", &pid,
-                      (float *)(void *)&comm); /* workaround gcc warning */
-               pevent_register_comm(pevent, comm, pid);
-               free(comm);
-@@ -133,7 +133,7 @@ void parse_proc_kallsyms(struct pevent *
-       line = strtok_r(file, "\n", &next);
-       while (line) {
-               mod = NULL;
--              ret = sscanf(line, "%as %c %as\t[%as",
-+              ret = sscanf(line, "%ms %c %ms\t[%ms",
-                            (float *)(void *)&addr_str, /* workaround gcc warning */
-                            &ch,
-                            (float *)(void *)&func,

diff --git a/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch b/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch
new file mode 100644 (file)
index 0000000..e2a6897
--- /dev/null
+++ b/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch
@@ -0,0 +1,24 @@
+--- a/plugin_mac80211.c
++++ b/plugin_mac80211.c
+@@ -179,12 +179,15 @@ static int drv_config(struct trace_seq *
+               { 2, "IDLE" },
+               { 3, "QOS"},
+       );
+-      pevent_print_num_field(s, " chan:%d/", event, "center_freq", record, 1);
+-      print_enum(s, event, "channel_type", data,
+-              { 0, "noht" },
+-              { 1, "ht20" },
+-              { 2, "ht40-" },
+-              { 3, "ht40+" });
++      pevent_print_num_field(s, " chan:%d@", event, "control_freq", record, 1);
++      print_enum(s, event, "chan_width", data,
++              { 0, "20_noht" },
++              { 1, "20" },
++              { 2, "40" },
++              { 3, "80" },
++              { 4, "80p80" },
++              { 5, "160" });
++
+       trace_seq_putc(s, ' ');
+       SF("power_level");
+