[precise/lts-backport-trusty 1/2] UBUNTU: [Config] amd64 -- enable cloud-tools

[Andy Whitcroft]

We are recommending the linux-lts-trusty combination for precise for use
on Hyper-V, therefore we need the linux-cloud-tools packages.

BugLink: http://bugs.launchpad.net/bugs/1345059
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.trusty/control.d/flavour-control.stub | 10 ++++++++++
 debian.trusty/control.stub.in                | 25 ++++++++++++++++++++++++-
 debian.trusty/rules.d/amd64.mk               |  3 +--
 debian.trusty/rules.d/i386.mk                |  2 --
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/debian.trusty/control.d/flavour-control.stub b/debian.trusty/control.d/flavour-control.stub
index 6dedd9d..85b3866 100644
--- a/debian.trusty/control.d/flavour-control.stub
+++ b/debian.trusty/control.d/flavour-control.stub
@@ -86,6 +86,16 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM
  version PKGVER-ABINUM on
  =HUMAN=.
 
+Package: linux-cloud-tools-PKGVER-ABINUM-FLAVOUR
+Architecture: ARCH
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}, SRCPKGNAME-cloud-tools-PKGVER-ABINUM
+Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM
+ This package provides the architecture dependant parts for kernel
+ version locked tools for cloud for version PKGVER-ABINUM on
+ =HUMAN=.
+
 Package: SRCPKGNAME-udebs-FLAVOUR
 XC-Package-Type: udeb
 Section: debian-installer
diff --git a/debian.trusty/control.stub.in b/debian.trusty/control.stub.in
index a12f0fb..221e8a1 100644
--- a/debian.trusty/control.stub.in
+++ b/debian.trusty/control.stub.in
@@ -41,4 +41,27 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM
  =HUMAN=.
  You probabally want to install linux-tools-PKGVER-ABINUM-<flavour>.
 
- 
+#Package: SRCPKGNAME-cloud-tools-common
+#Architecture: all
+#Multi-Arch: foreign
+#Section: kernel
+#Priority: optional
+#Breaks: SRCPKGNAME-tools-common (<< 3.13.0-8.28), hv-kvp-daemon-init (<< 3.13)
+#Replaces: SRCPKGNAME-tools-common (<< 3.13.0-8.28), hv-kvp-daemon-init (<< 3.13)
+#Depends: ${misc:Depends}
+#Description: Linux kernel version specific cloud tools for version PKGVER
+# This package provides the architecture independent parts for kernel
+# version locked tools for cloud tools for version PGKVER.
+
+Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM
+Architecture: i386 amd64 armhf
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
+Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM
+ This package provides the architecture dependant parts for kernel
+ version locked tools for cloud tools for version PKGVER-ABINUM on
+ =HUMAN=.
+ You probabally want to install linux-cloud-tools-PKGVER-ABINUM-<flavour>.
+
+
diff --git a/debian.trusty/rules.d/amd64.mk b/debian.trusty/rules.d/amd64.mk
index 76881c3..c634b13 100644
--- a/debian.trusty/rules.d/amd64.mk
+++ b/debian.trusty/rules.d/amd64.mk
@@ -16,8 +16,7 @@ do_libc_dev_package=false
 do_source_package=false
 do_doc_package  = false
 
-do_tools        = true
 do_tools_cpupower = true
 do_tools_perf   = true
 do_tools_x86	= true
-do_cloud_tools	= false
+do_tools_hyperv	= true
diff --git a/debian.trusty/rules.d/i386.mk b/debian.trusty/rules.d/i386.mk
index d87cced..2572ba4 100644
--- a/debian.trusty/rules.d/i386.mk
+++ b/debian.trusty/rules.d/i386.mk
@@ -14,8 +14,6 @@ do_libc_dev_package=false
 do_doc_package  = false
 do_source_package=false
 
-do_tools        = true
 do_tools_cpupower = true
 do_tools_perf   = true
 do_tools_x86	= true
-do_cloud_tools	= false
-- 
2.1.0