[linux-tools] 01/06: Merge tag 'debian/4.4-3'

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux-tools.

commit eb215f16de9202d6707d17afda97ee3ec55632d9
Merge: 0033746 8964473
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Feb 21 15:15:12 2016 +0000

    Merge tag 'debian/4.4-3'
    
    Move check-hyperv.c under debian/rules.d.

 debian/changelog                                   |  15 +++
 debian/copyright                                   |  19 ++++
 debian/hyperv-daemons.hv-fcopy-daemon.init         | 110 +++++++++++++++++++++
 debian/hyperv-daemons.hv-kvp-daemon.init           | 109 ++++++++++++++++++++
 debian/hyperv-daemons.hv-vss-daemon.init           | 109 ++++++++++++++++++++
 ...-tools-x86-build-perf-on-older-user-space.patch |  57 +++++++++++
 debian/patches/series                              |   1 +
 debian/rules.d/tools/hv/Makefile                   |   6 +-
 debian/rules.d/tools/hv/check-hyperv.c             | 103 +++++++++++++++++++
 debian/rules.d/tools/perf/Makefile                 |   2 +-
 debian/rules.real                                  |  10 ++
 debian/templates/control.main.in                   |   2 +-
 12 files changed, 539 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 6132e47,fecf5bb..06ac6ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,27 @@@
 +linux-tools (4.5~rc4-1~exp1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 +  [ Ben Hutchings ]
 +  * lockdep: Add missing macros
 +
 + -- Ben Hutchings <ben at decadent.org.uk>  Thu, 18 Feb 2016 03:19:14 +0000
 +
+ linux-tools (4.4-3) unstable; urgency=medium
+ 
+   * hyperv-daemons: Add init scripts
+ 
+  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 21 Feb 2016 15:07:55 +0000
+ 
+ linux-tools (4.4-2) unstable; urgency=medium
+ 
+   * linux-perf: Include version number in strace groups installation directory
+     (Closes: #813080)
+   * [alpha,sh4] Attempt to fix build failures
+   * Build fixdep under debian/build and clean it up properly
+ 
+  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 19 Feb 2016 17:11:29 +0000
+ 
  linux-tools (4.4-1) unstable; urgency=medium
  
    * Upload to unstable
diff --cc debian/patches/series
index 8858832,a845fe6..1d7e997
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -14,6 -14,12 +14,7 @@@ 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
 -nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch
 -perf-tools-fix-reading-of-build-id-from-vdso.patch
  perf-fix-misleadingly-indented-assignment-whitespace.patch
 -perf-add-missing-braces-to-if-statement.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-stop-building-fixdep-in-source.patch
 +lockdep-add-missing-macros.patch
diff --cc debian/rules.d/tools/hv/Makefile
index 25af786,fb3ff37..06a50a4
--- a/debian/rules.d/tools/hv/Makefile
+++ b/debian/rules.d/tools/hv/Makefile
@@@ -1,14 -1,16 +1,15 @@@
  PROGS = \
  	hv_fcopy_daemon \
  	hv_kvp_daemon \
- 	hv_vss_daemon
+ 	hv_vss_daemon \
+ 	check-hyperv
  
 -OUTDIR = tools/hv
  prefix = /usr/sbin
  
 -include ../../Makefile.inc
 +include $(top_rulesdir)/Makefile.inc
  
  install-local-progs: $(PROGS)
- 	@for p in $^; do \
+ 	@for p in $(filter-out check-hyperv,$^); do \
  	  echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)'"; \
  	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$$(basename $$p)"; \
  	done
diff --cc debian/rules.d/tools/hv/check-hyperv.c
index 0000000,4d2b6f5..4d2b6f5
mode 000000,100644..100644
--- a/debian/rules.d/tools/hv/check-hyperv.c
+++ b/debian/rules.d/tools/hv/check-hyperv.c
diff --cc debian/rules.real
index 34b0ebc,ca34334..adf4520
--- a/debian/rules.real
+++ b/debian/rules.real
@@@ -97,8 -93,13 +97,13 @@@ install-hyperv-daemons: $(STAMPS_DIR)/b
  	dh_testdir
  	dh_testroot
  	dh_prep
 -	$(MAKE) -C $(BUILD_DIR)/tools/hv install top_srcdir=$(CURDIR) DESTDIR=$(DIR)
 +	$(call submake,tools/hv) install DESTDIR=$(DIR)
  	dh_install
+ 	for service in fcopy kvp vss; do \
+ 		install -D -m755 debian/hyperv-daemons.hv-$$service-daemon.init \
+ 			$(DIR)/etc/init.d/hyperv-daemons.hv-$$service-daemon \
+ 			|| break; \
+ 	done
  	dh_installchangelogs
  	dh_installdocs
  	dh_systemd_enable

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git