[kernel] r19757 - in dists/sid/linux-tools/debian: . build/tools build/tools/hv patches patches/hyperv-backport templates

Ben Hutchings benh at alioth.debian.org
Sun Jan 20 15:33:15 UTC 2013


Author: benh
Date: Sun Jan 20 15:33:15 2013
New Revision: 19757

Log:
Revert "[x86] Build hyperv-services package containing the Hyper-V Key Value Pair daemon"

This just wasn't ready in time for wheezy.  We'll probably add it later.

Deleted:
   dists/sid/linux-tools/debian/build/tools/hv/Makefile
   dists/sid/linux-tools/debian/hyperv-services.hv_kvp_daemon.init
   dists/sid/linux-tools/debian/patches/hyperv-backport/0035-net-hyperv-Add-support-for-jumbo-frame-up-to-64KB.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0042-net-hyperv-Fix-the-page-buffer-when-an-RNDIS-message.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0043-drivers-hv-kvp-Add-cleanup-connector-defines.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0044-drivers-hv-kvp-Move-the-contents-of-hv_kvp.h-to-hype.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0063-drivers-hv-Cleanup-the-kvp-related-state-in-hyperv.h.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0064-tools-hv-Use-hyperv.h-to-get-the-KVP-definitions.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0065-drivers-hv-kvp-Cleanup-the-kernel-user-protocol.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0071-Drivers-hv-Add-new-message-types-to-enhance-KVP.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0073-Drivers-hv-Support-the-newly-introduced-KVP-messages.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0074-Tools-hv-Fully-support-the-new-KVP-verbs-in-the-user.patch
   dists/sid/linux-tools/debian/patches/hyperv-backport/0075-Tools-hv-Support-enumeration-from-all-the-pools.patch
   dists/sid/linux-tools/debian/patches/tools-hv-add-basic-manual-pages.patch
   dists/sid/linux-tools/debian/patches/tools-hv-check-for-read-write-errors.patch
   dists/sid/linux-tools/debian/patches/tools-hv-fix-exit-error-code.patch
   dists/sid/linux-tools/debian/patches/tools-hv-fix-file-handle-leak.patch
   dists/sid/linux-tools/debian/patches/tools-hv-fix-permissions.patch
   dists/sid/linux-tools/debian/patches/tools-hv-fix-string-types.patch
   dists/sid/linux-tools/debian/patches/tools-hv-fix-var-subdirectory.patch
   dists/sid/linux-tools/debian/patches/tools-hv-parse-etc-os-release.patch
   dists/sid/linux-tools/debian/patches/tools-hv-remove-unused-variables.patch
   dists/sid/linux-tools/debian/patches/tools-hv-verify-origin-of-netlink-connector-message.patch
Modified:
   dists/sid/linux-tools/debian/build/tools/Makefile
   dists/sid/linux-tools/debian/build/tools/hv/   (props changed)
   dists/sid/linux-tools/debian/changelog
   dists/sid/linux-tools/debian/patches/series
   dists/sid/linux-tools/debian/rules.real
   dists/sid/linux-tools/debian/templates/control.main.in

Modified: dists/sid/linux-tools/debian/build/tools/Makefile
==============================================================================
--- dists/sid/linux-tools/debian/build/tools/Makefile	Sat Jan 19 21:44:42 2013	(r19756)
+++ dists/sid/linux-tools/debian/build/tools/Makefile	Sun Jan 20 15:33:15 2013	(r19757)
@@ -1,5 +1,4 @@
 SUBDIRS = \
-	hv \
 	perf
 
 include ../Makefile.inc

Modified: dists/sid/linux-tools/debian/changelog
==============================================================================
--- dists/sid/linux-tools/debian/changelog	Sat Jan 19 21:44:42 2013	(r19756)
+++ dists/sid/linux-tools/debian/changelog	Sun Jan 20 15:33:15 2013	(r19757)
@@ -1,10 +1,3 @@
-linux-tools (3.2.17-2) UNRELEASED; urgency=low
-
-  * [x86] Build hyperv-services package containing the Hyper-V
-    Key Value Pair daemon
-
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 24 Jun 2012 06:20:33 +0100
-
 linux-tools (3.2.17-1) unstable; urgency=low
 
   * New upstream stable updates:

Modified: dists/sid/linux-tools/debian/patches/series
==============================================================================
--- dists/sid/linux-tools/debian/patches/series	Sat Jan 19 21:44:42 2013	(r19756)
+++ dists/sid/linux-tools/debian/patches/series	Sun Jan 20 15:33:15 2013	(r19757)
@@ -4,24 +4,3 @@
 usbip-update-man-pages.patch
 usbip-fix-explicit-configure-with-tcp-wrappers.patch
 usbip-document-tcp-wrappers.patch
-hyperv-backport/0035-net-hyperv-Add-support-for-jumbo-frame-up-to-64KB.patch
-hyperv-backport/0042-net-hyperv-Fix-the-page-buffer-when-an-RNDIS-message.patch
-hyperv-backport/0043-drivers-hv-kvp-Add-cleanup-connector-defines.patch
-hyperv-backport/0044-drivers-hv-kvp-Move-the-contents-of-hv_kvp.h-to-hype.patch
-hyperv-backport/0063-drivers-hv-Cleanup-the-kvp-related-state-in-hyperv.h.patch
-hyperv-backport/0064-tools-hv-Use-hyperv.h-to-get-the-KVP-definitions.patch
-hyperv-backport/0065-drivers-hv-kvp-Cleanup-the-kernel-user-protocol.patch
-hyperv-backport/0071-Drivers-hv-Add-new-message-types-to-enhance-KVP.patch
-hyperv-backport/0073-Drivers-hv-Support-the-newly-introduced-KVP-messages.patch
-hyperv-backport/0074-Tools-hv-Fully-support-the-new-KVP-verbs-in-the-user.patch
-hyperv-backport/0075-Tools-hv-Support-enumeration-from-all-the-pools.patch
-tools-hv-add-basic-manual-pages.patch
-tools-hv-fix-file-handle-leak.patch
-tools-hv-fix-exit-error-code.patch
-tools-hv-check-for-read-write-errors.patch
-tools-hv-fix-var-subdirectory.patch
-tools-hv-parse-etc-os-release.patch
-tools-hv-fix-string-types.patch
-tools-hv-remove-unused-variables.patch
-tools-hv-fix-permissions.patch
-tools-hv-verify-origin-of-netlink-connector-message.patch

Modified: dists/sid/linux-tools/debian/rules.real
==============================================================================
--- dists/sid/linux-tools/debian/rules.real	Sat Jan 19 21:44:42 2013	(r19756)
+++ dists/sid/linux-tools/debian/rules.real	Sun Jan 20 15:33:15 2013	(r19757)
@@ -8,9 +8,6 @@
 ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
   binary-arch: install-tools
 endif
-ifneq ($(filter amd64 i386,$(DEB_BUILD_ARCH)),)
-  binary-arch: install-hyperv
-endif
 
 build: $(STAMPS_DIR)/build
 
@@ -46,7 +43,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k -d
-	$(MAKE) -C $(BUILD_DIR)/tools/perf install top_srcdir=$(CURDIR) DESTDIR=$(DIR)
+	$(MAKE) -C $(BUILD_DIR)/tools install top_srcdir=$(CURDIR) DESTDIR=$(DIR)
 	dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/
 	dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/
 	dh_installchangelogs
@@ -81,23 +78,3 @@
 	dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN)
 	dh_md5sums
 	dh_builddeb
-
-install-hyperv: PACKAGE_NAME = hyperv-services
-install-hyperv: DH_OPTIONS = -p$(PACKAGE_NAME)
-install-hyperv: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
-install-hyperv: $(STAMPS_DIR)/build
-	dh_testdir
-	dh_testroot
-	dh_clean -k -d
-	$(MAKE) -C $(BUILD_DIR)/tools/hv install top_srcdir=$(CURDIR) DESTDIR=$(DIR)
-	dh_installinit --name=hv_kvp_daemon
-	dh_installchangelogs
-	dh_installdocs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb

Modified: dists/sid/linux-tools/debian/templates/control.main.in
==============================================================================
--- dists/sid/linux-tools/debian/templates/control.main.in	Sat Jan 19 21:44:42 2013	(r19756)
+++ dists/sid/linux-tools/debian/templates/control.main.in	Sun Jan 20 15:33:15 2013	(r19757)
@@ -47,12 +47,3 @@
  .
  This package provides the server component 'usbipd' and the
  client tool 'usbip'.
-
-Package: hyperv-services
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14)
-Description: Hyper-V Key Value Pair daemon
- This package contains the Hyper-V Key Value Pair daemon, part of
- Linux Integration Services for Hyper-V.  When installed on a guest
- virtual machine, this allows the host to read the guest OS version
- and network configuration, and to store information in the guest.



More information about the Kernel-svn-changes mailing list