[linux-tools] 02/06: Merge tag 'debian/4.4.6-1'
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Mar 20 21:27:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux-tools.
commit 4fe6a76379d7006a41d47f806deba2188a03b2f3
Merge: 545a89a 6e8c2c9
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Mar 20 19:25:30 2016 +0000
Merge tag 'debian/4.4.6-1'
Move debian/build/tools/power/cpupower/Makefile to
debian/rules.d/tools/power/cpupower/Makefile where it belongs now.
debian/bin/gencontrol.py | 7 +++
debian/changelog | 23 ++++++++
debian/copyright | 32 +++++------
debian/libcpupower-dev.install | 2 +
debian/libcpupower0.install | 1 +
debian/libcpupower0.symbols | 44 +++++++++++++++
debian/linux-cpupower.install | 2 +
.../patches/power-cpupower-fix-manpages-NAME.patch | 62 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules.d/tools/Makefile | 1 +
debian/rules.d/tools/power/cpupower/Makefile | 20 +++++++
debian/rules.real | 24 ++++++++-
debian/templates/control.main.in | 29 ++++++++++
debian/templates/control.source.in | 4 +-
debian/templates/lintian-overrides.perf.in | 3 ++
15 files changed, 237 insertions(+), 18 deletions(-)
diff --cc debian/changelog
index be33158,54bfd62..b6602c1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,26 +1,71 @@@
+linux-tools (4.5-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 20 Mar 2016 15:31:39 +0000
+
+linux-tools (4.5~rc7-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * Makefile.inc: Add support for wildcards in $(SCRIPTS) and $(DATA)
+ * linux-kbuild: Include scripts/Makefile.* (Closes: #815593)
+ * Makefile.inc, rules.real: Fix conflation of $(DESTDIR) and $(prefix)
+ * hyperv-daemons: Fix rule redefinition that 'make' warns about
+ * debian/control: Build-Depend on dh-python, as dh_python2 warns we should
+ * lockdep: Add '+' prefix to make invocation, so it can be parallelised
+ * tools/build: Fix 'unused variable' warning in the bpf() feature check
+ * lockdep: Add more missing macros
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 07 Mar 2016 03:07:00 +0000
+
+linux-tools (4.5~rc5-1~exp3) experimental; urgency=medium
+
+ * Adjust build fix from unstable
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Feb 2016 23:45:04 +0000
+
+linux-tools (4.5~rc5-1~exp2) experimental; urgency=medium
+
+ * Merge build fix from unstable
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Feb 2016 17:40:52 +0000
+
+linux-tools (4.5~rc5-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * lockdep: Add missing macros
+ * Adjust VPATH to work for check-hyperv (and simplify the modpost wrapper)
+ * tools/build: Remove bpf() run-time check at build time
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Feb 2016 16:45:52 +0000
+
+ linux-tools (4.4.6-1) unstable; urgency=medium
+
+ * New upstream stable update:
+ - tools lib traceevent: Fix output of %llu for 64 bit values read on
+ 32 bit machines
+ - perf tools: tracepoint_error() can receive e=NULL, robustify it
+ - perf kvm record/report: 'unprocessable sample' error while
+ recording/reporting guest data
+ - tools: hv: vss: fix the write()'s argument: error -> vss_msg
+ - uapi: update install list after nvme.h rename
+ - perf stat: Do not clean event's private stats
+
+ [ Mattia Dongili ]
+ * Build linux-cpupower.
+
+ [ Ben Hutchings ]
+ * debian/control: Update policy version to 3.9.7; no changes required
+ * linux-perf: Override lintian errors for perf-read-vdso{,x}32 in
+ 64-bit packages
+ * debian/copyright: Move GPL-2 boilerplate to its own paragraph
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 20 Mar 2016 16:23:48 +0000
+
linux-tools (4.4-4) unstable; urgency=medium
* hyperv-daemons: Only build the progarams on x86 (fixes FTBFS)
diff --cc debian/patches/series
index 59c555c,b1dd533..57f129f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -14,8 -14,13 +14,9 @@@ tools-lib-lockdep-use-ldflags.patc
tools-hv-fix-fortify-format-warning.patch
revert-perf-build-fix-libunwind-feature-detection-on.patch
alpha-uapi-add-support-for-__sane_userspace_types__.patch
-perf-tools-fix-reading-of-build-id-from-vdso.patch
perf-fix-misleadingly-indented-assignment-whitespace.patch
-perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing.patch
perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch
-perf-remove-wrong-semicolon-in-while-loop.patch
revert-perf-tools-x86-build-perf-on-older-user-space.patch
-perf-tools-fix-bpf-feature-check.patch
-tools-build-use-fixdep-with-output-path-prefix.patch
-power-cpupower-fix-incorrect-if-statement.patch
+lockdep-add-missing-macros.patch
+tools-build-remove-bpf-run-time-check-at-build-time.patch
+ power-cpupower-fix-manpages-NAME.patch
diff --cc debian/rules.d/tools/Makefile
index e99cdca,1ea9cf3..371c9f5
--- a/debian/rules.d/tools/Makefile
+++ b/debian/rules.d/tools/Makefile
@@@ -2,6 -2,7 +2,7 @@@ SUBDIRS =
hv \
lib/lockdep \
perf \
+ power/cpupower \
usb/usbip
-include ../Makefile.inc
+include $(top_rulesdir)/Makefile.inc
diff --cc debian/rules.d/tools/power/cpupower/Makefile
index 0000000,66e2c75..66e2c75
mode 000000,100644..100644
--- a/debian/rules.d/tools/power/cpupower/Makefile
+++ b/debian/rules.d/tools/power/cpupower/Makefile
diff --cc debian/rules.real
index 08391ba,dd3980a..6338c70
--- a/debian/rules.real
+++ b/debian/rules.real
@@@ -3,11 -3,7 +3,11 @@@ export KBUILD_BUILD_TIMESTAMP := $(shel
include debian/rules.defs
+define submake
++mkdir -p $(BUILD_DIR)/$(1) && $(MAKE) -C $(BUILD_DIR)/$(1) -f $(CURDIR)/debian/rules.d/$(1)/Makefile top_srcdir=$(CURDIR) top_rulesdir=$(CURDIR)/debian/rules.d OUTDIR=$(1)
+endef
+
- binary-arch: install-kbuild install-usbip install-liblockdep
+ binary-arch: install-kbuild install-usbip install-liblockdep install-cpupower
ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
binary-arch: install-perf
endif
diff --cc debian/templates/control.source.in
index 791ec51,4e9f714..d53e8b2
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@@ -7,7 -7,7 +7,7 @@@ Standards-Version: 3.9.
Build-Depends:
debhelper (>> 7), python3,
asciidoc, bison, flex, gcc-multilib [amd64 ppc64 s390x sparc64], libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32], libperl-dev, libunwind8-dev [amd64 armel armhf arm64 i386], python-dev, xmlto,
- autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev,
+ autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev, libpci-dev,
- dh-systemd
+ dh-python, dh-systemd
Vcs-Git: https://anonscm.debian.org/git/kernel/linux-tools.git
Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux-tools.git
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git
More information about the Kernel-svn-changes
mailing list