diff options
author | James <> | 2013-03-17 12:16:37 +0000 |
---|---|---|
committer | James <> | 2013-03-17 12:16:37 +0000 |
commit | 27b76ab0671089c47506615a796a261e993896a7 (patch) | |
tree | 61213d67e7fa87b20356b23798558e2c4212c42f /package/devel/trace-cmd | |
download | trunk-36060-master.tar.gz trunk-36060-master.tar.bz2 trunk-36060-master.zip |
Diffstat (limited to 'package/devel/trace-cmd')
8 files changed, 383 insertions, 0 deletions
diff --git a/package/devel/trace-cmd/.svn/entries b/package/devel/trace-cmd/.svn/entries new file mode 100644 index 0000000..c543b16 --- /dev/null +++ b/package/devel/trace-cmd/.svn/entries @@ -0,0 +1,65 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/devel/trace-cmd +svn://svn.openwrt.org/openwrt + + + +2012-11-27T18:08:42.110454Z +34390 +jow + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +patches +dir + +Makefile +file + + + + +2013-03-17T12:13:21.000000Z +71856f00391d8b28e513844f4e1a28a1 +2012-11-27T18:08:42.110454Z +34390 +jow + + + + + + + + + + + + + + + + + + + + + +1585 + diff --git a/package/devel/trace-cmd/.svn/text-base/Makefile.svn-base b/package/devel/trace-cmd/.svn/text-base/Makefile.svn-base new file mode 100644 index 0000000..1d555db --- /dev/null +++ b/package/devel/trace-cmd/.svn/text-base/Makefile.svn-base @@ -0,0 +1,61 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=trace-cmd +PKG_VERSION:=v2.0.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_SOURCE_VERSION:=1776cf9a24f95b2623fe7ee380d708bb8c6d8a73 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +# PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620 +PKG_INSTALL:=1 + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/trace-cmd + SECTION:=devel + CATEGORY:=Development + TITLE:=Linux trace command line utility + DEPENDS:= +endef + +define Package/trace-cmd-extra + SECTION:=devel + CATEGORY:=Development + TITLE:=Extra plugins for trace-cmd + DEPENDS:= +endef + +MAKE_FLAGS += \ + NO_PYTHON=1 \ + prefix=/usr + +PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins +PLUGINS_MAIN := function hrtimer mac80211 sched_switch + +TARGET_CFLAGS += --std=gnu99 + +define Package/trace-cmd/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/trace-cmd/plugins + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trace-cmd $(1)/usr/bin/ + $(CP) \ + $(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \ + $(1)/usr/lib/trace-cmd/plugins +endef + +define Package/trace-cmd-extra/install + $(INSTALL_DIR) $(1)/usr/lib/trace-cmd/plugins + $(CP) \ + $$(patsubst %,$(PLUGINS_DIR)/plugin_%.so, \ + $$(filter-out $(PLUGINS_MAIN), \ + $$(patsubst $(PLUGINS_DIR)/plugin_%.so,%, \ + $$(wildcard $(PLUGINS_DIR)/plugin_*.so)))) \ + $(1)/usr/lib/trace-cmd/plugins +endef + +$(eval $(call BuildPackage,trace-cmd)) +$(eval $(call BuildPackage,trace-cmd-extra)) diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile new file mode 100644 index 0000000..1d555db --- /dev/null +++ b/package/devel/trace-cmd/Makefile @@ -0,0 +1,61 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=trace-cmd +PKG_VERSION:=v2.0.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_SOURCE_VERSION:=1776cf9a24f95b2623fe7ee380d708bb8c6d8a73 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +# PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620 +PKG_INSTALL:=1 + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/trace-cmd + SECTION:=devel + CATEGORY:=Development + TITLE:=Linux trace command line utility + DEPENDS:= +endef + +define Package/trace-cmd-extra + SECTION:=devel + CATEGORY:=Development + TITLE:=Extra plugins for trace-cmd + DEPENDS:= +endef + +MAKE_FLAGS += \ + NO_PYTHON=1 \ + prefix=/usr + +PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins +PLUGINS_MAIN := function hrtimer mac80211 sched_switch + +TARGET_CFLAGS += --std=gnu99 + +define Package/trace-cmd/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/trace-cmd/plugins + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trace-cmd $(1)/usr/bin/ + $(CP) \ + $(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \ + $(1)/usr/lib/trace-cmd/plugins +endef + +define Package/trace-cmd-extra/install + $(INSTALL_DIR) $(1)/usr/lib/trace-cmd/plugins + $(CP) \ + $$(patsubst %,$(PLUGINS_DIR)/plugin_%.so, \ + $$(filter-out $(PLUGINS_MAIN), \ + $$(patsubst $(PLUGINS_DIR)/plugin_%.so,%, \ + $$(wildcard $(PLUGINS_DIR)/plugin_*.so)))) \ + $(1)/usr/lib/trace-cmd/plugins +endef + +$(eval $(call BuildPackage,trace-cmd)) +$(eval $(call BuildPackage,trace-cmd-extra)) diff --git a/package/devel/trace-cmd/patches/.svn/entries b/package/devel/trace-cmd/patches/.svn/entries new file mode 100644 index 0000000..784671a --- /dev/null +++ b/package/devel/trace-cmd/patches/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/devel/trace-cmd/patches +svn://svn.openwrt.org/openwrt + + + +2012-10-29T19:25:43.127587Z +34002 +nbd + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +100-compile_fix.patch +file + + + + +2013-03-17T12:13:21.000000Z +281431187e241123c6221e9911262a8a +2012-10-29T19:25:43.127587Z +34002 +nbd + + + + + + + + + + + + + + + + + + + + + +652 + +110-fix_sscanf_alloc.patch +file + + + + +2013-03-17T12:13:21.000000Z +0c5ea93585cdaf423ace452f713af757 +2012-10-29T19:25:43.127587Z +34002 +nbd + + + + + + + + + + + + + + + + + + + + + +671 + diff --git a/package/devel/trace-cmd/patches/.svn/text-base/100-compile_fix.patch.svn-base b/package/devel/trace-cmd/patches/.svn/text-base/100-compile_fix.patch.svn-base new file mode 100644 index 0000000..151c123 --- /dev/null +++ b/package/devel/trace-cmd/patches/.svn/text-base/100-compile_fix.patch.svn-base @@ -0,0 +1,30 @@ +--- 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 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> +--- a/trace-record.c ++++ b/trace-record.c +@@ -17,6 +17,7 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/package/devel/trace-cmd/patches/.svn/text-base/110-fix_sscanf_alloc.patch.svn-base b/package/devel/trace-cmd/patches/.svn/text-base/110-fix_sscanf_alloc.patch.svn-base new file mode 100644 index 0000000..c0af0c6 --- /dev/null +++ b/package/devel/trace-cmd/patches/.svn/text-base/110-fix_sscanf_alloc.patch.svn-base @@ -0,0 +1,20 @@ +--- 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/100-compile_fix.patch b/package/devel/trace-cmd/patches/100-compile_fix.patch new file mode 100644 index 0000000..151c123 --- /dev/null +++ b/package/devel/trace-cmd/patches/100-compile_fix.patch @@ -0,0 +1,30 @@ +--- 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 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> +--- a/trace-record.c ++++ b/trace-record.c +@@ -17,6 +17,7 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch b/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch new file mode 100644 index 0000000..c0af0c6 --- /dev/null +++ b/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch @@ -0,0 +1,20 @@ +--- 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, |