Commit 375d93f1 authored by Seth Forshee's avatar Seth Forshee Committed by Juerg Haefliger

UBUNTU: [Packaging] Add linux-tools-host package for VM host tools

BugLink: http://bugs.launchpad.net/bugs/1764794
OldBugLink: http://bugs.launchpad.net/bugs/1734130

IBM has requested that we package the kvm_stat tool from the
kernel source tree. This is a python script and thus is not
kernel-version specific. Because of this, and in order to avoid
adding a python dependency, this tool is not added to any
existing tools package.

Instead, create a new linux-tools-host package to contain tools
useful on VM hosts which will currently only contain kvm_stat.
Don't build this package unless specified in the architecture
rules file; it should only be built in the master kernel and in
a single architecture for any given series.
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Acked-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 286e4fe8
...@@ -177,3 +177,13 @@ Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM ...@@ -177,3 +177,13 @@ Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM
=HUMAN=. =HUMAN=.
You probably want to install linux-cloud-tools-PKGVER-ABINUM-<flavour>. You probably want to install linux-cloud-tools-PKGVER-ABINUM-<flavour>.
Package: SRCPKGNAME-tools-host
Build-Profiles: <!stage1>
Architecture: all
Multi-Arch: foreign
Section: kernel
Priority: optional
Depends: ${misc:Depends}, python3
Description: Linux kernel VM host tools
This package provides kernel tools useful for VM hosts.
...@@ -36,6 +36,7 @@ include $(DROOT)/rules.d/1-maintainer.mk ...@@ -36,6 +36,7 @@ include $(DROOT)/rules.d/1-maintainer.mk
do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86))) do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86)))
do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv))) do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv)))
do_tools_common?=true do_tools_common?=true
do_tools_host?=false
# Don't build tools or udebs in a cross compile environment. # Don't build tools or udebs in a cross compile environment.
ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
...@@ -83,6 +84,7 @@ ifneq ($(do_tools),true) ...@@ -83,6 +84,7 @@ ifneq ($(do_tools),true)
do_linux_tools= do_linux_tools=
do_cloud_tools= do_cloud_tools=
do_tools_common= do_tools_common=
do_tools_host=
endif endif
ifeq ($(do_zfs),false) ifeq ($(do_zfs),false)
......
...@@ -186,6 +186,7 @@ tools_flavour_pkg_name=linux-tools-$(abi_release) ...@@ -186,6 +186,7 @@ tools_flavour_pkg_name=linux-tools-$(abi_release)
cloud_pkg_name=$(src_pkg_name)-cloud-tools-$(abi_release) cloud_pkg_name=$(src_pkg_name)-cloud-tools-$(abi_release)
cloud_common_pkg_name=$(src_pkg_name)-cloud-tools-common cloud_common_pkg_name=$(src_pkg_name)-cloud-tools-common
cloud_flavour_pkg_name=linux-cloud-tools-$(abi_release) cloud_flavour_pkg_name=linux-cloud-tools-$(abi_release)
hosttools_pkg_name=$(src_pkg_name)-tools-host
# The general flavour specific image package. # The general flavour specific image package.
do_flavour_image_package=true do_flavour_image_package=true
......
...@@ -85,6 +85,7 @@ printenv: ...@@ -85,6 +85,7 @@ printenv:
@echo " do_tools_cpupower = $(do_tools_cpupower)" @echo " do_tools_cpupower = $(do_tools_cpupower)"
@echo " do_tools_perf = $(do_tools_perf)" @echo " do_tools_perf = $(do_tools_perf)"
@echo " do_tools_x86 = $(do_tools_x86)" @echo " do_tools_x86 = $(do_tools_x86)"
@echo " do_tools_host = $(do_tools_host)"
@echo "do_cloud_tools = $(do_cloud_tools)" @echo "do_cloud_tools = $(do_cloud_tools)"
@echo " do_tools_hyperv = $(do_tools_hyperv)" @echo " do_tools_hyperv = $(do_tools_hyperv)"
@echo "any_signed = $(any_signed)" @echo "any_signed = $(any_signed)"
......
...@@ -86,6 +86,9 @@ install-tools: toolspkg = $(tools_common_pkg_name) ...@@ -86,6 +86,9 @@ install-tools: toolspkg = $(tools_common_pkg_name)
install-tools: toolsbin = $(CURDIR)/debian/$(toolspkg)/usr/bin install-tools: toolsbin = $(CURDIR)/debian/$(toolspkg)/usr/bin
install-tools: toolssbin = $(CURDIR)/debian/$(toolspkg)/usr/sbin install-tools: toolssbin = $(CURDIR)/debian/$(toolspkg)/usr/sbin
install-tools: toolsman = $(CURDIR)/debian/$(toolspkg)/usr/share/man install-tools: toolsman = $(CURDIR)/debian/$(toolspkg)/usr/share/man
install-tools: hosttoolspkg = $(hosttools_pkg_name)
install-tools: hosttoolsbin = $(CURDIR)/debian/$(hosttoolspkg)/usr/bin
install-tools: hosttoolsman = $(CURDIR)/debian/$(hosttoolspkg)/usr/share/man
install-tools: cloudpkg = $(cloud_common_pkg_name) install-tools: cloudpkg = $(cloud_common_pkg_name)
install-tools: cloudbin = $(CURDIR)/debian/$(cloudpkg)/usr/bin install-tools: cloudbin = $(CURDIR)/debian/$(cloudpkg)/usr/bin
install-tools: cloudsbin = $(CURDIR)/debian/$(cloudpkg)/usr/sbin install-tools: cloudsbin = $(CURDIR)/debian/$(cloudpkg)/usr/sbin
...@@ -141,6 +144,17 @@ endif ...@@ -141,6 +144,17 @@ endif
endif endif
ifeq ($(do_tools_host),true)
install -d $(hosttoolsbin)
install -d $(hosttoolsman)/man1
install -m 755 $(CURDIR)/tools/kvm/kvm_stat/kvm_stat $(hosttoolsbin)/
cd $(builddir)/tools/tools/kvm/kvm_stat && make man
install -m644 $(builddir)/tools/tools/kvm/kvm_stat/*.1 \
$(hosttoolsman)/man1
endif
install-indep: install-tools install-indep: install-tools
@echo Debug: $@ @echo Debug: $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment