diff --git a/debian/changelog b/debian/changelog index d6d8c81bd..bf719464d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 28 Jun 2015 20:23:11 +0200 diff --git a/debian/patches/tools-perf-install.patch b/debian/patches/tools-perf-install.patch index 6de3c81ff..03b2694f7 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 -@@ -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 @@ 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 -@@ -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'; \ diff --git a/debian/patches/tools-perf-version.patch b/debian/patches/tools-perf-version.patch index fb3d790aa..5ea2f4885 100644 --- a/debian/patches/tools-perf-version.patch +++ b/debian/patches/tools-perf-version.patch @@ -9,17 +9,7 @@ version-dependent name. And do the same for trace.] --- 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 @@ version-dependent name. And do the same for trace.] $(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 @@ version-dependent name. And do the same for trace.] $(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 @@ version-dependent name. And do the same for trace.] 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(