[PATCH 2/2 Trusty-meta V2] UBUNTU: Cleanup RELEASE_NAME logic

tim.gardner at canonical.com tim.gardner at canonical.com
Wed Nov 19 21:18:07 UTC 2014 

From: Tim Gardner <tim.gardner at canonical.com>

Remove some unused entries for LBM.
Use RELEASE_NAME for entries that will be carried forward
to the next LTS. Reorder the common entries to make it clear
which upgrade packages need to be dropped for the next release (Utopic).

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 meta-source/debian/changelog            |  3 ++
 meta-source/debian/control.common       | 62 ++++++++++++++++-----------------
 meta-source/debian/control.d/generic    | 28 ---------------
 meta-source/debian/control.d/lowlatency | 14 --------
 meta-source/debian/rules                |  2 +-
 5 files changed, 35 insertions(+), 74 deletions(-)

diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog
index 8067c71..3f60592 100644
--- a/meta-source/debian/changelog
+++ b/meta-source/debian/changelog
@@ -15,6 +15,9 @@ linux-meta (3.13.0.41.48) UNRELEASED; urgency=medium
       Update to the next HWE kernel by changing HWE_KERNEL_NAME in debian/rules. 
       -LP: #1393877
 
+  * UBUNTU: Cleanup superfluous RELEASE_NAME logic
+    Also correct Vcs-Git URL error.
+
  -- Tim Gardner <tim.gardner at canonical.com>  Tue, 18 Nov 2014 14:03:12 -0600
 
 linux-meta (3.13.0.40.47) trusty; urgency=medium
diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
index 827dbec..0587558 100644
--- a/meta-source/debian/control.common
+++ b/meta-source/debian/control.common
@@ -29,6 +29,37 @@ Description: Linux kernel crashdump setup for the latest generic kernel
  you can install this package to automatically enable capture of the
  vmcore on crashes.
 
+#
+# 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
+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
+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
+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-RELEASE_NAME
+Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Section: kernel
+Priority: optional
+Depends: ${misc:Depends}, linux-image-hwe-virtual-RELEASE_NAME, linux-headers-virtual-lts-HWE_KERNEL_NAME
+Description: Depends on the virtual hardware enablement kernel image and headers.
+
 # Upgrade packages (drop after trusty)
 
 Package: linux-tools-lts-quantal
@@ -359,34 +390,3 @@ 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/control.d/generic b/meta-source/debian/control.d/generic
index b612d97..b6db47d 100644
--- a/meta-source/debian/control.d/generic
+++ b/meta-source/debian/control.d/generic
@@ -45,31 +45,3 @@ Description: Complete Generic Linux kernel and headers
  This package will always depend on the latest complete generic Linux kernel
  and headers.
 
-#Package: linux-backports-modules-headers-RELEASE_NAME-generic
-#Architecture: i386 amd64
-#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
-#Description: Backported driver headers for generic kernel image
-# This empty package allows people to keep their backported module
-# headers up-to-date when upgrading their Linux kernel.
-
-#Package: linux-backports-modules-cw-3.6-RELEASE_NAME-generic
-#Architecture: i386 amd64
-#Depends: ${misc:Depends}, linux-backports-modules-cw-3.6-${kernel-abi-version}-generic
-#Description: Backported wireless drivers for generic kernel image
-# This empty package allows people to keep their backported wireless modules
-# up-to-date when upgrading their Linux kernel.
-
-#Package: linux-backports-modules-net-RELEASE_NAME-generic
-#Architecture: amd64
-#Depends: ${misc:Depends}, linux-backports-modules-net-${kernel-abi-version}-generic
-#Description: Backported ethernet drivers for generic kernel image.
-# This empty package allows people to keep their backported ethernet modules
-# up-to-date when upgrading their Linux kernel.
-#
-#Package: linux-backports-modules-alsa-RELEASE_NAME-generic
-#Architecture: amd64
-#Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
-#Description: Backported drivers for alsa-driver snapshot.
-# This empty package allows people to keep their alsa-driver snapshot
-# up-to-date when upgrading their Linux kernel.
-#
diff --git a/meta-source/debian/control.d/lowlatency b/meta-source/debian/control.d/lowlatency
index 4dabf36..37c89a3 100644
--- a/meta-source/debian/control.d/lowlatency
+++ b/meta-source/debian/control.d/lowlatency
@@ -45,17 +45,3 @@ Description: Complete lowlatency Linux kernel
  This package will always depend on the latest complete lowlatency Linux kernel
  available.
 
-#Package: linux-backports-modules-headers-RELEASE_NAME-lowlatency
-#Architecture: amd64 i386
-#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-lowlatency
-#Description: Backported driver headers for lowlatency kernel image
-# This empty package allows people to keep their backported module
-# headers up-to-date when upgrading their Linux kernel.
-#
-#Package: linux-backports-modules-alsa-RELEASE_NAME-lowlatency
-#Architecture: amd64 i386
-#Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-lowlatency
-#Description: Backported drivers for alsa-driver snapshot.
-# This empty package allows people to keep their alsa-driver snapshot
-# up-to-date when upgrading their Linux kernel.
-#
diff --git a/meta-source/debian/rules b/meta-source/debian/rules
index d69dd70..b85f6e5 100755
--- a/meta-source/debian/rules
+++ b/meta-source/debian/rules
@@ -7,7 +7,7 @@
 # Copyright (c) 2004 Jens Schmalzing <jensen at debian.org>
 #
 
-RELEASE_NAME=saucy
+RELEASE_NAME=trusty
 HWE_KERNEL_NAME=utopic
 
 # 5 digit versions (2.6.38.<abi>.<upload>, 3 digit kernel base versions (2.6.38)
-- 
2.1.3

More information about the kernel-team mailing list