From patchwork Fri Aug 29 18:01:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 384342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id D28F714013B; Sat, 30 Aug 2014 04:01:32 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XNQUL-0007oC-TS; Fri, 29 Aug 2014 18:01:29 +0000 Received: from mail-wg0-f51.google.com ([74.125.82.51]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XNQUE-0007mw-VP for kernel-team@lists.ubuntu.com; Fri, 29 Aug 2014 18:01:22 +0000 Received: by mail-wg0-f51.google.com with SMTP id l18so2517537wgh.22 for ; Fri, 29 Aug 2014 11:01:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Dm4/AIP7l/T6qQE+4gAs/GF/FFHRoc7p+bhxqHkTcNU=; b=YkKpBAAPS7zO+ueiJx4H8j1hlO4DDYVITYqMqTTLUEiy9XNfKxlcJyYuFBy+KvZXj7 UA3yGxz2vtkMThkE1N+DS3oYpjF2Ij8qa74KBYM/4tmbHmssvwu/+sV+FtryQhAwb0PO 0Bkps6YQ00YHkWMbw1T+fUTgTgdNHUqtGdow53gTyM90SU1QNcF2HRCil1Zhf1dexM8R ZGIxBw6gY3DQZyDbYYOMf1tppHGDFe/+2FwlDyAXz9frh9iX+KrNQDegkXmQWpGuyPgU xTFfzbkw6qT9QHmaIHpPMFx9ED15rMjAs1vhcYfl8kzdDsUWKdpSKzTyEynzPHWtHZT+ 0Zag== X-Gm-Message-State: ALoCoQno5EF41SETOFcvpIR0/vdd5xQfEqH1cWbdHK1yT+YHEEB+TzMMSP4JSVdy0tqZ2ZvihP+w X-Received: by 10.180.106.8 with SMTP id gq8mr5509936wib.56.1409335282780; Fri, 29 Aug 2014 11:01:22 -0700 (PDT) Received: from localhost ([2001:470:6973:2:e5c6:9695:41e1:8a57]) by mx.google.com with ESMTPSA id y5sm1565606wje.32.2014.08.29.11.01.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Aug 2014 11:01:22 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [precise/lts-backport-trusty 1/2] UBUNTU: [Config] amd64 -- enable cloud-tools Date: Fri, 29 Aug 2014 19:01:19 +0100 Message-Id: <1409335281-15180-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1409335281-15180-1-git-send-email-apw@canonical.com> References: <1409335281-15180-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 --- 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-. - +#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-. + + 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