Bug#782761: linux-tools: Please include tools/hv daemons in a binary
package
Message-Id: <20150608205238.228f760ca5282c589b143c63@debian.or.jp>
In-Reply-To: <[🔎] 20150607211847.8f2f71073a8903e1b0d9a203@debian.or.jp>
Organization: Debian JP Project
X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/mixed;
boundary="Multipart=_Mon__8_Jun_2015_20_52_38_+0900_Wpq9207X8Y=nSOJ/"
This is a multi-part message in MIME format.
--Multipart=_Mon__8_Jun_2015_20_52_38_+0900_Wpq9207X8Y=nSOJ/
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
On Sun, 7 Jun 2015 21:18:47 +0900 Hideki Yamane <henrich@debian.or.jp> wrote:
> Here's a rough patch for hyperv daemons package (not tested yet)
> I'll try it later, but anyway for the record.
updated patch
--
Regards,
Hideki Yamane henrich @ debian.or.jp/org
http://wiki.debian.org/HidekiYamane
--Multipart=_Mon__8_Jun_2015_20_52_38_+0900_Wpq9207X8Y=nSOJ/
Content-Type: text/x-diff;
name="linux-tools_hyperv-support.patch"
Content-Disposition: attachment;
filename="linux-tools_hyperv-support.patch"
Content-Transfer-Encoding: 7bit
diff -Nru linux-tools-4.0.2/debian/README.Debian.hyperv-daemons linux-tools-4.0.2/debian/README.Debian.hyperv-daemons
--- linux-tools-4.0.2/debian/README.Debian.hyperv-daemons 1970-01-01 09:00:00.000000000 +0900
+++ linux-tools-4.0.2/debian/README.Debian.hyperv-daemons 2015-06-08 20:31:11.000000000 +0900
@@ -0,0 +1,14 @@
+hyperv-daemon for Debian
+------------------------
+
+ If you want to change screen resolution on Linux guest,
+ plese update kernel parameter.
+
+ 1. edit /etc/default/grub file
+ - add 'video=hyperv_fb:"horizontal"x"vertical"' to
+ 'GRUB_CMDLINE_LINUX_DEFAULT=' or 'GRUB_CMDLINE_LINUX=' line
+ (e.g. GRUB_CMDLINE_LINUX=video=hyperv_fb:1280x1024)
+ 2. then, exec update-grub
+ 3. reboot Linux guest
+
+ -- Hideki Yamane <henrich@debian.org> Thu, 28 May 2015 10:23:52 +0900
diff -Nru linux-tools-4.0.2/debian/build/tools/hv/Makefile linux-tools-4.0.2/debian/build/tools/hv/Makefile
--- linux-tools-4.0.2/debian/build/tools/hv/Makefile 1970-01-01 09:00:00.000000000 +0900
+++ linux-tools-4.0.2/debian/build/tools/hv/Makefile 2015-05-28 19:53:33.000000000 +0900
@@ -0,0 +1,13 @@
+srcdir := $(top_srcdir)/tools/hv
+
+# Make sure we don't override top_srcdir in the sub-make. 'unexport
+# top_srcdir' is *not* sufficient; nor is adding 'MAKEFLAGS=' to the
+# sub-make command line.
+unexport MAKEFLAGS
+
+all:
+ cd $(top_srcdir)/tools/hv; $(MAKE) all
+
+
+clean:
+ cd $(top_srcdir)/tools/hv; $(MAKE) clean
diff -Nru linux-tools-4.0.2/debian/changelog linux-tools-4.0.2/debian/changelog
--- linux-tools-4.0.2/debian/changelog 2015-05-11 11:53:13.000000000 +0900
+++ linux-tools-4.0.2/debian/changelog 2015-06-07 20:07:42.000000000 +0900
@@ -1,3 +1,10 @@
+linux-tools (4.0.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * create hyperv-daemons package (Closes: #782761)
+
+ -- Hideki Yamane <henrich@debian.org> Thu, 28 May 2015 10:23:52 +0900
+
linux-tools (4.0.2-1) unstable; urgency=medium
* New upstream release
diff -Nru linux-tools-4.0.2/debian/control linux-tools-4.0.2/debian/control
--- linux-tools-4.0.2/debian/control 2015-05-11 12:06:30.000000000 +0900
+++ linux-tools-4.0.2/debian/control 2015-06-08 20:32:50.000000000 +0900
@@ -4,7 +4,7 @@
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Bastian Blank <waldi@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Jonathan Nieder <jrnieder@gmail.com>
Standards-Version: 3.9.4
-Build-Depends: debhelper (>> 7), python, 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
+Build-Depends: debhelper (>> 7), python, 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, dh-systemd
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/
@@ -60,3 +60,22 @@
This package provides the server component 'usbipd' and the client tool
'usbip'.
+Package: hyperv-daemons
+Architecture: amd64 i386
+Section: admin
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Suite of daemons needed Linux guest is running on HyperV
+ Suite of daemons that are needed when Linux guest is running on HyperV. It
+ includes: hv-fcopy-daemon, hv-kvp-daemon, hv-vss-daemon
+ .
+ hv-fcopy-daemon is an implementation of file copy service functionality
+ for Linux Guest running on HyperV, it enables host to copy a file (over
+ VMBUS) into the Linux Guest.
+ .
+ hv-kvp-daemon is an implementation of HyperV key value pair (KVP)
+ functionality for Linux, it also supports IP injection functionality on
+ the Guest.
+ .
+ hv-vss-daemon is an implementation of HyperV VSS functionality for Linux,
+ it is used for host initiated guest snapshot on HyperV hypervisor.
+
diff -Nru linux-tools-4.0.2/debian/control.md5sum linux-tools-4.0.2/debian/control.md5sum
--- linux-tools-4.0.2/debian/control.md5sum 2015-05-11 12:06:30.000000000 +0900
+++ linux-tools-4.0.2/debian/control.md5sum 2015-06-08 20:32:50.000000000 +0900
@@ -1,4 +1,4 @@
ac3acacf0cde6d2cc424f28241bb0857 debian/bin/gencontrol.py
-78da1757427bbfdfaa8e54c64e5d627a debian/changelog
-711fd0ce9d080e6cf27efddb74863670 debian/templates/control.main.in
-5205a9db9cb5241ea836fb20502bf045 debian/templates/control.source.in
+42a333dc4e58b0836836374d25b1c963 debian/changelog
+20f100a0cca6c9a34e7e2111351dde30 debian/templates/control.main.in
+9b14df86e2c2a98032c65fe4b1fa3ddf debian/templates/control.source.in
diff -Nru linux-tools-4.0.2/debian/copyright linux-tools-4.0.2/debian/copyright
--- linux-tools-4.0.2/debian/copyright 2013-09-25 09:18:33.000000000 +0900
+++ linux-tools-4.0.2/debian/copyright 2015-06-08 20:37:23.000000000 +0900
@@ -30,3 +30,7 @@
Files: debian/*
Copyright: 2006-2012 Debian kernel team
License: GPL-2
+
+Files: debian/*.services
+Copyright: 2013-2014 Tomas Hozza <thozza@redhat.com>
+License: GPL-2
diff -Nru linux-tools-4.0.2/debian/hv_fcopy_daemon.service linux-tools-4.0.2/debian/hv_fcopy_daemon.service
--- linux-tools-4.0.2/debian/hv_fcopy_daemon.service 1970-01-01 09:00:00.000000000 +0900
+++ linux-tools-4.0.2/debian/hv_fcopy_daemon.service 2015-05-28 20:47:49.000000000 +0900
@@ -0,0 +1,10 @@
+[Unit]
+Description=Hyper-V FCOPY daemon
+ConditionVirtualization=microsoft
+ConditionPathExists=/dev/vmbus/hv_fcopy
+
+[Service]
+ExecStart=/usr/sbin/hv_fcopy_daemon -n
+
+[Install]
+WantedBy=multi-user.target
diff -Nru linux-tools-4.0.2/debian/hv_kvp_daemon.service linux-tools-4.0.2/debian/hv_kvp_daemon.service
--- linux-tools-4.0.2/debian/hv_kvp_daemon.service 1970-01-01 09:00:00.000000000 +0900
+++ linux-tools-4.0.2/debian/hv_kvp_daemon.service 2015-05-28 20:46:54.000000000 +0900
@@ -0,0 +1,10 @@
+[Unit]
+Description=Hyper-V KVP daemon
+ConditionVirtualization=microsoft
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/hv_kvp_daemon -n
+
+[Install]
+WantedBy=multi-user.target
diff -Nru linux-tools-4.0.2/debian/hv_vss_demon.service linux-tools-4.0.2/debian/hv_vss_demon.service
--- linux-tools-4.0.2/debian/hv_vss_demon.service 1970-01-01 09:00:00.000000000 +0900
+++ linux-tools-4.0.2/debian/hv_vss_demon.service 2015-05-28 20:46:33.000000000 +0900
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hyper-V VSS daemon
+ConditionVirtualization=microsoft
+
+[Service]
+ExecStart=/usr/sbin/hv_vss_daemon -n
+
+[Install]
+WantedBy=multi-user.target
diff -Nru linux-tools-4.0.2/debian/hyperv-daemons.install linux-tools-4.0.2/debian/hyperv-daemons.install
--- linux-tools-4.0.2/debian/hyperv-daemons.install 1970-01-01 09:00:00.000000000 +0900
+++ linux-tools-4.0.2/debian/hyperv-daemons.install 2015-06-07 21:05:15.000000000 +0900
@@ -0,0 +1,2 @@
+tools/hv/hv*daemon usr/sbin/
+debian/*.service lib/systemd/system/
diff -Nru linux-tools-4.0.2/debian/rules.gen linux-tools-4.0.2/debian/rules.gen
--- linux-tools-4.0.2/debian/rules.gen 2015-05-11 12:06:30.000000000 +0900
+++ linux-tools-4.0.2/debian/rules.gen 2015-06-08 20:32:50.000000000 +0900
@@ -1,5 +1,5 @@
.NOTPARALLEL:
binary-arch::
- $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='4.0' VERSION='4.0' VERSION_DEBIAN='4.0.2-1'
+ $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='4.0' VERSION='4.0' VERSION_DEBIAN='4.0.2-1.1'
build::
- $(MAKE) -f debian/rules.real build UPSTREAMVERSION='4.0' VERSION='4.0' VERSION_DEBIAN='4.0.2-1'
+ $(MAKE) -f debian/rules.real build UPSTREAMVERSION='4.0' VERSION='4.0' VERSION_DEBIAN='4.0.2-1.1'
diff -Nru linux-tools-4.0.2/debian/rules.real linux-tools-4.0.2/debian/rules.real
--- linux-tools-4.0.2/debian/rules.real 2015-02-01 09:53:48.000000000 +0900
+++ linux-tools-4.0.2/debian/rules.real 2015-06-08 19:58:29.000000000 +0900
@@ -8,7 +8,7 @@
# includes any binNMU part.
VERSION_DEBIAN_FULL := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
-binary-arch: install-kbuild install-usbip
+binary-arch: install-kbuild install-usbip install-hyperv-daemons
ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32,$(DEB_BUILD_ARCH)),)
binary-arch: install-tools
endif
@@ -82,3 +82,29 @@
dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN_FULL)
dh_md5sums
dh_builddeb
+
+install-hyperv-daemons: PACKAGE_NAME = hyperv-daemons
+install-hyperv-daemons: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-hyperv-daemons: $(STAMPS_DIR)/build
+ dh_testdir
+ dh_testroot
+ dh_clean -d
+ $(MAKE) -C $(CURDIR)/tools/hv/
+ dh_install
+ dh_installchangelogs
+ dh_installdocs
+ dh_systemd_enable -p$(PACKAGE_NAME) --name hyperv-fcopy-daemon debian/hv_fcopy_daemon.service
+ dh_systemd_enable -p$(PACKAGE_NAME) --name hyperv-kvp-daemon debian/hv_kvp_daemon.service
+ dh_systemd_enable -p$(PACKAGE_NAME) --name hyperv-vss-daemon debian/hv_vss_demon.service
+ dh_systemd_start -p$(PACKAGE_NAME) --restart-after-upgrade debian/hv_fcopy_daemon.service
+ dh_systemd_start -p$(PACKAGE_NAME) --restart-after-upgrade debian/hv_kvp_daemon.service
+ dh_systemd_start -p$(PACKAGE_NAME) --restart-after-upgrade debian/hv_vss_demon.service
+ dh_lintian
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN_FULL)
+ dh_md5sums
+ dh_builddeb
diff -Nru linux-tools-4.0.2/debian/templates/control.main.in linux-tools-4.0.2/debian/templates/control.main.in
--- linux-tools-4.0.2/debian/templates/control.main.in 2015-02-01 08:36:41.000000000 +0900
+++ linux-tools-4.0.2/debian/templates/control.main.in 2015-06-08 20:32:42.000000000 +0900
@@ -49,3 +49,21 @@
.
This package provides the server component 'usbipd' and the
client tool 'usbip'.
+
+Package: hyperv-daemons
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: admin
+Description: Suite of daemons needed Linux guest is running on HyperV
+ Suite of daemons that are needed when Linux guest is running on HyperV.
+ It includes: hv-fcopy-daemon, hv-kvp-daemon, hv-vss-daemon
+ .
+ hv-fcopy-daemon is an implementation of file copy service functionality for
+ Linux Guest running on HyperV, it enables host to copy a file (over VMBUS)
+ into the Linux Guest.
+ .
+ hv-kvp-daemon is an implementation of HyperV key value pair (KVP) functionality
+ for Linux, it also supports IP injection functionality on the Guest.
+ .
+ hv-vss-daemon is an implementation of HyperV VSS functionality for Linux,
+ it is used for host initiated guest snapshot on HyperV hypervisor.
diff -Nru linux-tools-4.0.2/debian/templates/control.source.in linux-tools-4.0.2/debian/templates/control.source.in
--- linux-tools-4.0.2/debian/templates/control.source.in 2015-05-11 10:53:58.000000000 +0900
+++ linux-tools-4.0.2/debian/templates/control.source.in 2015-06-08 19:48:51.000000000 +0900
@@ -7,6 +7,7 @@
Build-Depends:
debhelper (>> 7), python,
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,
+ dh-systemd
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/
--Multipart=_Mon__8_Jun_2015_20_52_38_+0900_Wpq9207X8Y=nSOJ/--
Reply to: