From patchwork Tue Nov 18 20:33:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 412159 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 21A541400F4; Wed, 19 Nov 2014 07:33:45 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XqpSy-0006rW-GB; Tue, 18 Nov 2014 20:33:36 +0000 Received: from mail-oi0-f44.google.com ([209.85.218.44]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XqpSt-0006rF-Hq for kernel-team@lists.ubuntu.com; Tue, 18 Nov 2014 20:33:31 +0000 Received: by mail-oi0-f44.google.com with SMTP id e131so4799073oig.3 for ; Tue, 18 Nov 2014 12:33:31 -0800 (PST) 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; bh=uny3kDOBoP9sUimECBjDs/5Qvm9FMpmAVg9uXZSO4Uw=; b=VfmxBQGCAZEJQmC/Nl1X3FLLW3WkDLnT93SS0rd710JlAYtjOxLlpbIusa1QUJdr5P DWCb3tUKa9mh8N+zQ0kGaktfhWyZWYhWiw+1KKe9yYOAipfLfmkNJejS7aQBIPo51Z4k caD0pcIrRCAhB8i73Ewl2X056y31VVMx173oDBKIR+IVApYkVuoXqxSNLSTUnKWiv6sO FB1wnd9Ijl0HQsDb16WziNV6zuCOy7XeIGjK2RenDXmkCNEL6mVubi1IHsEYuHabNEuz 1LwsEoj/Ya86Iv4msDiCncMSmlKUWfW/t5yUTjKdDIEp+XZwxBEh2jEPhR9PNW/4Pd2l kjSA== X-Gm-Message-State: ALoCoQn6WgL8RyZ49JzkxCAtwpEkvFZQKTOZKY3Npc4IYiKE8DvOUF6XuS742i+d0LjU+1GBBLJj X-Received: by 10.182.98.168 with SMTP id ej8mr15318020obb.41.1416342801002; Tue, 18 Nov 2014 12:33:21 -0800 (PST) Received: from localhost.localdomain (rrcs-67-79-14-250.sw.biz.rr.com. [67.79.14.250]) by mx.google.com with ESMTPSA id w6sm17263328obz.20.2014.11.18.12.33.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Nov 2014 12:33:19 -0800 (PST) From: tim.gardner@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4 Trusty meta SRU] UBUNTU: Add HWE kernel meta packages Date: Tue, 18 Nov 2014 14:33:09 -0600 Message-Id: <1416342792-13064-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.1.3 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 From: Tim Gardner BugLink: http://bugs.launchpad.net/bugs/1393877 We messed up when naming HWE meta packages in Precise. We should have made those package names unique per LTS release because we cannot now create a HWE meta package of the same name without also creating an upgrade path that a user probably does not want. For example, upgrading from 12.04.[2-5] to 14.04 (after 14.04.2 is released) would upgrade to an HWE kernel instead of the 14.04 GA kernel as expected. Therefore, the HWE meta package name will be made unique by adding the name of the LTS release, e.g., linux-image-hwe-generic-trusty. Update to the next HWE kernel by changing HWE_KERNEL_NAME in debian/rules. Signed-off-by: Tim Gardner --- meta-source/debian/control.common | 32 ++++++++++++++++++++++++++++++++ meta-source/debian/rules | 3 ++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common index 0ae5386..827dbec 100644 --- a/meta-source/debian/control.common +++ b/meta-source/debian/control.common @@ -358,3 +358,35 @@ Priority: optional Depends: ${misc:Depends}, linux-signed-generic Description: Complete Signed Generic Linux kernel and headers Transistional package for upgrades from 12.04 to 14.04 (Precise to Trusty) + +# +# Reference the current Hardware Enablement LTS generic and virtual kernel flavours. +# +Package: linux-image-hwe-generic-trusty +Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Section: kernel +Priority: optional +Depends: ${misc:Depends}, linux-image-generic-lts-HWE_KERNEL_NAME +Description: Depends on the generic hardware enablement kernel image. + +Package: linux-hwe-generic-trusty +Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Section: kernel +Priority: optional +Depends: ${misc:Depends}, linux-image-hwe-generic-trusty, linux-headers-generic-lts-HWE_KERNEL_NAME +Description: Depends on the generic hardware enablement kernel image and headers. + +Package: linux-image-hwe-virtual-trusty +Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Section: kernel +Priority: optional +Depends: ${misc:Depends}, linux-image-virtual-lts-HWE_KERNEL_NAME +Description: Depends on the virtual hardware enablement kernel image. + +Package: linux-hwe-virtual-trusty +Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Section: kernel +Priority: optional +Depends: ${misc:Depends}, linux-image-hwe-virtual-trusty, linux-headers-virtual-lts-HWE_KERNEL_NAME +Description: Depends on the virtual hardware enablement kernel image and headers. + diff --git a/meta-source/debian/rules b/meta-source/debian/rules index b3d3a01..d69dd70 100755 --- a/meta-source/debian/rules +++ b/meta-source/debian/rules @@ -8,6 +8,7 @@ # RELEASE_NAME=saucy +HWE_KERNEL_NAME=utopic # 5 digit versions (2.6.38.., 3 digit kernel base versions (2.6.38) KERNEL_VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed -e \ @@ -43,7 +44,7 @@ clean: debian/control debian/control: $(control_files) rm -f debian/control.tmp for i in $^; do \ - sed 's/RELEASE_NAME/$(RELEASE_NAME)/g' $$i >> debian/control.tmp; \ + sed -e 's/RELEASE_NAME/$(RELEASE_NAME)/g' -e 's/HWE_KERNEL_NAME/$(HWE_KERNEL_NAME)/g' $$i >> debian/control.tmp; \ echo >> debian/control.tmp; \ done rm -f $@