diff mbox

[1/1] UBUNTU: fix linux-*-hwe-* linkage

Message ID 1440690104-11371-2-git-send-email-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft Aug. 27, 2015, 3:41 p.m. UTC 
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 meta-source/debian/changelog      |  7 +++++++
 meta-source/debian/control.common | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

Comments

Tim Gardner Aug. 27, 2015, 4:50 p.m. UTC | #1 
I really think it should be "dangling"
Brad Figg Aug. 28, 2015, 3:12 p.m. UTC | #2 
Applied to the master branch of Trusty meta.
diff mbox

Patch

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 <apw@canonical.com>  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)