From e534752fb2759983dcf7afb58371e7d567e76138 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 9 Mar 2014 17:38:51 +0000 Subject: [PATCH] Update to 3.14-rc5 svn path=/dists/trunk/linux-tools/; revision=21136 --- debian/changelog | 6 ++ ...fallback-definition-of-EFD_SEMAPHORE.patch | 30 -------- ...e-Initial-beautifier-for-ioctl-s-cmd.patch | 74 ------------------- debian/patches/series | 2 - debian/patches/tools-perf-install.patch | 12 +-- debian/patches/tools-perf-version.patch | 12 +-- 6 files changed, 18 insertions(+), 118 deletions(-) delete mode 100644 debian/patches/perf-trace-Add-fallback-definition-of-EFD_SEMAPHORE.patch delete mode 100644 debian/patches/revert-perf-trace-Initial-beautifier-for-ioctl-s-cmd.patch diff --git a/debian/changelog b/debian/changelog index fe6d567ef..a19343d45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-tools (3.14~rc5-1~exp1) UNRELEASED; urgency=medium + + * New upstream release candidate + + -- Ben Hutchings Sun, 09 Mar 2014 13:45:19 +0000 + linux-tools (3.13.4-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/patches/perf-trace-Add-fallback-definition-of-EFD_SEMAPHORE.patch b/debian/patches/perf-trace-Add-fallback-definition-of-EFD_SEMAPHORE.patch deleted file mode 100644 index 5e34cf7ce..000000000 --- a/debian/patches/perf-trace-Add-fallback-definition-of-EFD_SEMAPHORE.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Ben Hutchings -Date: Thu, 6 Feb 2014 00:46:51 +0000 -Subject: [PATCH 2/3] perf trace: Add fallback definition of EFD_SEMAPHORE -Forwarded: http://mid.gmane.org/1391648435.3003.100.camel@deadeye.wl.decadent.org.uk - -glibc 2.17 is missing this on sparc, despite the fact that it's -not architecture-specific. - -Fixes: 49af9e93adfa ('perf trace: Beautify eventfd2 'flags' arg') -Signed-off-by: Ben Hutchings -Cc: ---- - tools/perf/builtin-trace.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c -index c9671bd..5c32dcf 100644 ---- a/tools/perf/builtin-trace.c -+++ b/tools/perf/builtin-trace.c -@@ -35,6 +35,10 @@ - # define MADV_UNMERGEABLE 13 - #endif - -+#ifndef EFD_SEMAPHORE -+# define EFD_SEMAPHORE 1 -+#endif -+ - struct tp_field { - int offset; - union { diff --git a/debian/patches/revert-perf-trace-Initial-beautifier-for-ioctl-s-cmd.patch b/debian/patches/revert-perf-trace-Initial-beautifier-for-ioctl-s-cmd.patch deleted file mode 100644 index 909fdbc1e..000000000 --- a/debian/patches/revert-perf-trace-Initial-beautifier-for-ioctl-s-cmd.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Ben Hutchings -Date: Thu, 6 Feb 2014 00:46:39 +0000 -Subject: [PATCH 1/3] Revert "perf trace: Initial beautifier for ioctl's 'cmd' arg" -Forwarded: http://mid.gmane.org/1391648425.3003.99.camel@deadeye.wl.decadent.org.uk - -This reverts commit 78645cf3ed32860a3e83b8e35aa469f5b844a4ba, -which is incorrect for many architectures and has broken -compilation on at least powerpc and sparc. - -Signed-off-by: Ben Hutchings -Cc: ---- - tools/perf/builtin-trace.c | 34 +--------------------------------- - 1 file changed, 1 insertion(+), 33 deletions(-) - -diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c -index 8be17fc..c9671bd 100644 ---- a/tools/perf/builtin-trace.c -+++ b/tools/perf/builtin-trace.c -@@ -275,14 +275,6 @@ static size_t syscall_arg__scnprintf_strarray(char *bf, size_t size, - - #define SCA_STRARRAY syscall_arg__scnprintf_strarray - --static size_t syscall_arg__scnprintf_strhexarray(char *bf, size_t size, -- struct syscall_arg *arg) --{ -- return __syscall_arg__scnprintf_strarray(bf, size, "%#x", arg); --} -- --#define SCA_STRHEXARRAY syscall_arg__scnprintf_strhexarray -- - static size_t syscall_arg__scnprintf_fd(char *bf, size_t size, - struct syscall_arg *arg); - -@@ -835,28 +827,6 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal - - #define SCA_SIGNUM syscall_arg__scnprintf_signum - --#define TCGETS 0x5401 -- --static const char *tioctls[] = { -- "TCGETS", "TCSETS", "TCSETSW", "TCSETSF", "TCGETA", "TCSETA", "TCSETAW", -- "TCSETAF", "TCSBRK", "TCXONC", "TCFLSH", "TIOCEXCL", "TIOCNXCL", -- "TIOCSCTTY", "TIOCGPGRP", "TIOCSPGRP", "TIOCOUTQ", "TIOCSTI", -- "TIOCGWINSZ", "TIOCSWINSZ", "TIOCMGET", "TIOCMBIS", "TIOCMBIC", -- "TIOCMSET", "TIOCGSOFTCAR", "TIOCSSOFTCAR", "FIONREAD", "TIOCLINUX", -- "TIOCCONS", "TIOCGSERIAL", "TIOCSSERIAL", "TIOCPKT", "FIONBIO", -- "TIOCNOTTY", "TIOCSETD", "TIOCGETD", "TCSBRKP", [0x27] = "TIOCSBRK", -- "TIOCCBRK", "TIOCGSID", "TCGETS2", "TCSETS2", "TCSETSW2", "TCSETSF2", -- "TIOCGRS485", "TIOCSRS485", "TIOCGPTN", "TIOCSPTLCK", -- "TIOCGDEV||TCGETX", "TCSETX", "TCSETXF", "TCSETXW", "TIOCSIG", -- "TIOCVHANGUP", "TIOCGPKT", "TIOCGPTLCK", "TIOCGEXCL", -- [0x50] = "FIONCLEX", "FIOCLEX", "FIOASYNC", "TIOCSERCONFIG", -- "TIOCSERGWILD", "TIOCSERSWILD", "TIOCGLCKTRMIOS", "TIOCSLCKTRMIOS", -- "TIOCSERGSTRUCT", "TIOCSERGETLSR", "TIOCSERGETMULTI", "TIOCSERSETMULTI", -- "TIOCMIWAIT", "TIOCGICOUNT", [0x60] = "FIOQSIZE", --}; -- --static DEFINE_STRARRAY_OFFSET(tioctls, 0x5401); -- - #define STRARRAY(arg, name, array) \ - .arg_scnprintf = { [arg] = SCA_STRARRAY, }, \ - .arg_parm = { [arg] = &strarray__##array, } -@@ -937,9 +907,7 @@ static struct syscall_fmt { - { .name = "getrlimit", .errmsg = true, STRARRAY(0, resource, rlimit_resources), }, - { .name = "ioctl", .errmsg = true, - .arg_scnprintf = { [0] = SCA_FD, /* fd */ -- [1] = SCA_STRHEXARRAY, /* cmd */ -- [2] = SCA_HEX, /* arg */ }, -- .arg_parm = { [1] = &strarray__tioctls, /* cmd */ }, }, -+ [2] = SCA_HEX, /* arg */ }, }, - { .name = "kill", .errmsg = true, - .arg_scnprintf = { [1] = SCA_SIGNUM, /* sig */ }, }, - { .name = "linkat", .errmsg = true, diff --git a/debian/patches/series b/debian/patches/series index a7055abb4..bb7bb2475 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,4 @@ modpost-symbol-prefix.patch tools-perf-version.patch tools-perf-install.patch usbip-document-tcp-wrappers.patch -revert-perf-trace-Initial-beautifier-for-ioctl-s-cmd.patch -perf-trace-Add-fallback-definition-of-EFD_SEMAPHORE.patch perf-trace-Decode-architecture-specific-signal-numbe.patch diff --git a/debian/patches/tools-perf-install.patch b/debian/patches/tools-perf-install.patch index 2a8b44f2d..6de3c81ff 100644 --- a/debian/patches/tools-perf-install.patch +++ b/debian/patches/tools-perf-install.patch @@ -7,7 +7,7 @@ Forwarded: no --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf -@@ -827,8 +827,8 @@ install-bin: all install-gtk +@@ -842,8 +842,8 @@ install-bin: all install-gtk ifndef NO_LIBPERL $(call QUIET_INSTALL, perl-scripts) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \ @@ -18,7 +18,7 @@ Forwarded: no $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'; \ $(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' endif -@@ -836,18 +836,18 @@ ifndef NO_LIBPYTHON +@@ -851,18 +851,18 @@ ifndef NO_LIBPYTHON $(call QUIET_INSTALL, python-scripts) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'; \ @@ -28,10 +28,10 @@ Forwarded: no + $(INSTALL) -m 644 scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'; \ $(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin' endif - $(call QUIET_INSTALL, bash_completion-script) \ + $(call QUIET_INSTALL, perf_completion-script) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \ -- $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)' -+ $(INSTALL) -m 644 bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)' +- $(INSTALL) perf-completion.sh '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)' ++ $(INSTALL) -m 644 perf-completion.sh '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)' $(call QUIET_INSTALL, tests) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ - $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ @@ -40,5 +40,5 @@ Forwarded: no - $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' + $(INSTALL) -m 644 tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' - install: install-bin try-install-man + install: install-bin try-install-man install-traceevent-plugins diff --git a/debian/patches/tools-perf-version.patch b/debian/patches/tools-perf-version.patch index 17317b7f3..25d57e0c1 100644 --- a/debian/patches/tools-perf-version.patch +++ b/debian/patches/tools-perf-version.patch @@ -9,7 +9,7 @@ version-dependent name. And do the same for trace.] --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf -@@ -818,8 +818,8 @@ install-gtk: +@@ -833,8 +833,8 @@ install-gtk: install-bin: all install-gtk $(call QUIET_INSTALL, binaries) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \ @@ -20,16 +20,16 @@ version-dependent name. And do the same for trace.] $(call QUIET_INSTALL, libexec) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' $(call QUIET_INSTALL, perf-archive) \ -@@ -842,7 +842,7 @@ ifndef NO_LIBPYTHON +@@ -857,7 +857,7 @@ ifndef NO_LIBPYTHON endif - $(call QUIET_INSTALL, bash_completion-script) \ + $(call QUIET_INSTALL, perf_completion-script) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \ -- $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' -+ $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)' +- $(INSTALL) perf-completion.sh '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' ++ $(INSTALL) perf-completion.sh '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)' $(call QUIET_INSTALL, tests) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ -@@ -856,7 +856,7 @@ install-python_ext: +@@ -871,7 +871,7 @@ install-python_ext: # 'make install-doc' should call 'make -C Documentation install' $(INSTALL_DOC_TARGETS):