From patchwork Thu Aug 27 15:41:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 511352 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 24D7C1401DA; Fri, 28 Aug 2015 01:42:02 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZUzJN-00005d-Co; Thu, 27 Aug 2015 15:41:57 +0000 Received: from mail-wi0-f174.google.com ([209.85.212.174]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZUzJD-0008Qb-J5 for kernel-team@lists.ubuntu.com; Thu, 27 Aug 2015 15:41:47 +0000 Received: by wicgk12 with SMTP id gk12so13345615wic.1 for ; Thu, 27 Aug 2015 08:41:47 -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=IPOJ9xyXhkAeMR2wrMZPZUe4uypdgCpZI56YTXaF3pM=; b=KE1USZ32mHqFyZfEP1ODJXBPmIE0uFsDBwuAJSMImgssAYr3pES01GxboW7isuV94k b1FI3p0mGm3gnWVMf0BdaCE2qh6lI0OJW6u4O2+/6oQldsgw3P/DD4LWU9GIVaSxVhPa W3bSk9LjD4Y1ikRj0zf27XiY0qDk2/YkW1WZYm4dYctOZ8WVMQNWTyKnfkAdzTbXw4O1 MWTJ+ptnSieyDcMSnQwccoynGVzthlSWV9tmkTt7IyQQOLVHx5w4wHZauKbYMJ4dZlWx MzBIGYbdZYDJg3kgNajYUpWj/81ySRWfgMOxYlVq01LUl3avtfuCYCGX/AF+E1hb/ZfG Db8Q== X-Gm-Message-State: ALoCoQl0O56pxqTgH7FLdvyfyDGPUOKY7qDFn5p4arLj8Zqxh3xqD+/dOvWA5o49VcISE7pf+HMS X-Received: by 10.180.188.225 with SMTP id gd1mr11871485wic.84.1440690107418; Thu, 27 Aug 2015 08:41:47 -0700 (PDT) Received: from localhost ([2001:470:6973:2:2898:24e3:563a:3386]) by smtp.gmail.com with ESMTPSA id ul1sm3655469wjc.30.2015.08.27.08.41.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2015 08:41:46 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: fix linux-*-hwe-* linkage Date: Thu, 27 Aug 2015 16:41:44 +0100 Message-Id: <1440690104-11371-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1440690104-11371-1-git-send-email-apw@canonical.com> References: <1440690104-11371-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 Signed-off-by: Andy Whitcroft --- meta-source/debian/changelog | 7 +++++++ meta-source/debian/control.common | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog index 063326e..bb81f7c 100644 --- a/meta-source/debian/changelog +++ b/meta-source/debian/changelog @@ -1,3 +1,10 @@ +linux-meta (3.13.0.63.71) UNRELEASED; urgency=low + + * Fix up dandling linux-*-hwe-* meta packages. When we do not have a + flavour default it back to the generic packages. (LP: 1489487). + + -- Andy Whitcroft Thu, 27 Aug 2015 16:03:06 +0100 + linux-meta (3.13.0.63.70) trusty; urgency=medium [ Brad Figg ] diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common index 0587558..fa060a8 100644 --- a/meta-source/debian/control.common +++ b/meta-source/debian/control.common @@ -33,31 +33,31 @@ Description: Linux kernel crashdump setup for the latest generic kernel # Reference the current Hardware Enablement LTS generic and virtual kernel flavours. # Package: linux-image-hwe-generic-RELEASE_NAME -Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Architecture: i386 amd64 armhf arm64 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-RELEASE_NAME -Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-hwe-generic-RELEASE_NAME, linux-headers-generic-lts-HWE_KERNEL_NAME Description: Depends on the generic hardware enablement kernel image and headers. Package: linux-image-hwe-virtual-RELEASE_NAME -Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional -Depends: ${misc:Depends}, linux-image-virtual-lts-HWE_KERNEL_NAME +Depends: ${misc:Depends}, linux-image-virtual-lts-HWE_KERNEL_NAME [i386 amd64 ppc64el], linux-image-generic-lts-HWE_KERNEL_NAME [armhf arm64] Description: Depends on the virtual hardware enablement kernel image. Package: linux-hwe-virtual-RELEASE_NAME -Architecture: i386 amd64 armhf arm64 powerpc ppc64el +Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional -Depends: ${misc:Depends}, linux-image-hwe-virtual-RELEASE_NAME, linux-headers-virtual-lts-HWE_KERNEL_NAME +Depends: ${misc:Depends}, linux-image-hwe-virtual-RELEASE_NAME [i386 amd64 ppc64el], linux-headers-virtual-lts-HWE_KERNEL_NAME [i386 amd64 ppc64el], linux-image-hwe-generic-RELEASE_NAME [armhf arm64], linux-headers-generic-lts-HWE_KERNEL_NAME [armhf arm64] Description: Depends on the virtual hardware enablement kernel image and headers. # Upgrade packages (drop after trusty)