[PATCH] New upstream release (3.10)
This patch updates the linux-tools package for linux-3.10. This was relatively
straightforward except for the CONFIG_SYMBOL_PREFIX rework; I believe I have
kept with the spirit of the v3.9 version of the package.
HTH,
Chris
---
debian/changelog | 6 ++++++
debian/patches/modpost-symbol-prefix.patch | 23 ++++++++---------------
debian/patches/tools-perf-version.patch | 20 ++++++++++++--------
3 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f30d4cd..033aad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (3.10-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Chris Boot <debian@bootc.net> Mon, 01 Jul 2013 22:07:42 +0100
+
linux-tools (3.9.4-1) unstable; urgency=low
* New upstream release
diff --git a/debian/patches/modpost-symbol-prefix.patch b/debian/patches/modpost-symbol-prefix.patch
index 7fc7e7a..07cfd4d 100644
--- a/debian/patches/modpost-symbol-prefix.patch
+++ b/debian/patches/modpost-symbol-prefix.patch
@@ -1,19 +1,12 @@
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -16,15 +16,11 @@
- #include <ctype.h>
- #include <string.h>
+Index: linux-tools/scripts/mod/modpost.c
+===================================================================
+--- linux-tools.orig/scripts/mod/modpost.c 2013-06-30 23:13:29.000000000 +0100
++++ linux-tools/scripts/mod/modpost.c 2013-07-01 22:11:53.450887929 +0100
+@@ -18,7 +18,6 @@
+ #include <limits.h>
+ #include <stdbool.h>
#include "modpost.h"
-#include "../../include/generated/autoconf.h"
#include "../../include/linux/license.h"
+ #include "../../include/linux/export.h"
- /* Some toolchains use a `_' prefix for all user symbols. */
--#ifdef CONFIG_SYMBOL_PREFIX
--#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
--#else
-+/* No Debian architecture currently does this. */
- #define MODULE_SYMBOL_PREFIX ""
--#endif
-
-
- /* Are we using CONFIG_MODVERSIONS? */
diff --git a/debian/patches/tools-perf-version.patch b/debian/patches/tools-perf-version.patch
index 8dc5971..1a04222 100644
--- a/debian/patches/tools-perf-version.patch
+++ b/debian/patches/tools-perf-version.patch
@@ -1,6 +1,8 @@
---- a/tools/perf/Makefile
-+++ b/tools/perf/Makefile
-@@ -1141,7 +1141,7 @@ perfexec_instdir_SQ = $(subst ','\'',$(p
+Index: linux-tools/tools/perf/Makefile
+===================================================================
+--- linux-tools.orig/tools/perf/Makefile 2013-06-30 23:13:29.000000000 +0100
++++ linux-tools/tools/perf/Makefile 2013-07-01 22:13:20.073226760 +0100
+@@ -1172,7 +1172,7 @@
install-bin: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
@@ -9,7 +11,7 @@
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'
$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
-@@ -1154,7 +1154,7 @@ install-bin: all
+@@ -1185,7 +1185,7 @@
$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'
@@ -18,7 +20,7 @@
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'
-@@ -1167,7 +1167,7 @@ install-python_ext:
+@@ -1198,7 +1198,7 @@
# 'make install-doc' should call 'make -C Documentation install'
$(INSTALL_DOC_TARGETS):
@@ -27,9 +29,11 @@
### Cleaning rules
---- a/tools/perf/Documentation/Makefile
-+++ b/tools/perf/Documentation/Makefile
-@@ -188,13 +188,15 @@ ifdef missing_tools
+Index: linux-tools/tools/perf/Documentation/Makefile
+===================================================================
+--- linux-tools.orig/tools/perf/Documentation/Makefile 2013-06-30 23:13:29.000000000 +0100
++++ linux-tools/tools/perf/Documentation/Makefile 2013-07-01 22:13:20.073226760 +0100
+@@ -188,13 +188,15 @@
$(error "You need to install $(missing_tools) for man pages")
endif
--
1.7.10.4
Reply to: