[kernel] r22829 - in dists/trunk/linux-tools/debian: . patches

[Ben Hutchings]

Author: benh
Date: Sun Jul 12 23:58:02 2015
New Revision: 22829

Log:
Update to 4.1.2

Modified:
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/patches/tools-perf-install.patch
   dists/trunk/linux-tools/debian/patches/tools-perf-version.patch

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Sun Jul 12 23:20:31 2015	(r22828)
+++ dists/trunk/linux-tools/debian/changelog	Sun Jul 12 23:58:02 2015	(r22829)
@@ -1,5 +1,8 @@
-linux-tools (4.0.2-2) UNRELEASED; urgency=medium
+linux-tools (4.1.2-1~exp1) UNRELEASED; urgency=medium
 
+  * New upstream release
+
+  [ Bastian Blank ]
   * Add hyperv-daemons package, thanks to Hideki Yamane (closes: #782761)
 
  -- Bastian Blank <waldi at debian.org>  Sun, 28 Jun 2015 20:23:11 +0200

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-install.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-install.patch	Sun Jul 12 23:20:31 2015	(r22828)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-install.patch	Sun Jul 12 23:58:02 2015	(r22829)
@@ -7,7 +7,7 @@
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -842,8 +842,8 @@ install-bin: all install-gtk
+@@ -484,8 +484,8 @@ endif
  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 @@
  		$(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
-@@ -851,18 +851,18 @@ ifndef NO_LIBPYTHON
+@@ -493,18 +493,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'; \

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-version.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Sun Jul 12 23:20:31 2015	(r22828)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Sun Jul 12 23:58:02 2015	(r22829)
@@ -9,17 +9,7 @@
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -756,6 +756,9 @@ $(OUTPUT)util/find_next_bit.o: ../lib/ut
- $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS
- 	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -Wno-redundant-decls $<
- 
-+$(OUTPUT)util/vdso.o: util/vdso.c $(OUTPUT)PERF-CFLAGS
-+	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DPERFEXECDIR='"$(perfexec_instdir_SQ)"' $<
-+
- $(OUTPUT)util/scripting-engines/trace-event-perl.o: util/scripting-engines/trace-event-perl.c $(OUTPUT)PERF-CFLAGS
- 	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow -Wno-undef -Wno-switch-default $<
- 
-@@ -923,18 +926,18 @@ install-gtk:
+@@ -465,18 +465,18 @@ install-gtk:
  install-bin: all install-gtk
  	$(call QUIET_INSTALL, binaries) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
@@ -44,7 +34,7 @@
  	$(call QUIET_INSTALL, perf-archive) \
  		$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
  	$(call QUIET_INSTALL, perf-with-kcore) \
-@@ -957,7 +960,7 @@ ifndef NO_LIBPYTHON
+@@ -499,7 +499,7 @@ ifndef NO_LIBPYTHON
  endif
  	$(call QUIET_INSTALL, perf_completion-script) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \
@@ -53,7 +43,7 @@
  	$(call QUIET_INSTALL, tests) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
  		$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
-@@ -971,7 +974,7 @@ install-python_ext:
+@@ -513,7 +513,7 @@ install-python_ext:
  
  # 'make install-doc' should call 'make -C Documentation install'
  $(INSTALL_DOC_TARGETS):
@@ -87,6 +77,16 @@
  
  install-man: check-man-tools man
  
+--- a/tools/perf/util/Build
++++ b/tools/perf/util/Build
+@@ -127,6 +127,7 @@ CFLAGS_find_next_bit.o += -Wno-unused-pa
+ CFLAGS_rbtree.o        += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
+ CFLAGS_hweight.o       += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
+ CFLAGS_parse-events.o  += -Wno-redundant-decls
++CFLAGS_vdso.o		+= -DPERFEXECDIR='"$(perfexec_instdir_SQ)"'
+ 
+ $(OUTPUT)util/kallsyms.o: ../lib/symbol/kallsyms.c FORCE
+ 	$(call rule_mkdir)
 --- a/tools/perf/util/vdso.c
 +++ b/tools/perf/util/vdso.c
 @@ -51,12 +51,12 @@ static struct vdso_info *vdso_info__new(