diff mbox

[xenial/gke/master,1/1] UBUNTU: [Config] linux-tools-* linux-cloud-tools-* share -common packages with linux

Message ID 20170509175209.20241-4-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft May 9, 2017, 5:52 p.m. UTC 
We should be using the primary linux-tools-common and
linux-cloud-tools-common packages not making our own.  Switch our
dependencies over to those and stop building these packages.

BugLink: http://bugs.launchpad.net/bugs/1688579
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.gke/control.stub.in | 27 ++-------------------------
 debian.gke/hooks.mk        |  1 +
 2 files changed, 3 insertions(+), 25 deletions(-)
 create mode 100644 debian.gke/hooks.mk
diff mbox

Patch

diff --git a/debian.gke/control.stub.in b/debian.gke/control.stub.in
index ee5a46951067..601d4586b973 100644
--- a/debian.gke/control.stub.in
+++ b/debian.gke/control.stub.in
@@ -84,24 +84,12 @@  Description: Header files related to Linux kernel version PKGVER
  that want the latest kernel headers. Please read
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
-Package: SRCPKGNAME-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Depends: ${misc:Depends}
-Description: Linux kernel version specific tools for version PKGVER
- This package provides the architecture independent parts for kernel
- version locked tools (such as perf and x86_energy_perf_policy) for
- version PGKVER.
-
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, SRCPKGNAME-tools-common
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
 Description: Linux kernel version specific tools for version PKGVER-ABINUM
  This package provides the architecture dependant parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy) for
@@ -109,23 +97,12 @@  Description: Linux kernel version specific tools for version PKGVER-ABINUM
  =HUMAN=.
  You probably want to install linux-tools-PKGVER-ABINUM-<flavour>.
 
-Package: SRCPKGNAME-cloud-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-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
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, SRCPKGNAME-cloud-tools-common
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-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
diff --git a/debian.gke/hooks.mk b/debian.gke/hooks.mk
new file mode 100644
index 000000000000..e0c4f46609e8
--- /dev/null
+++ b/debian.gke/hooks.mk
@@ -0,0 +1 @@ 
+do_tools_common=false