diff mbox

[3/4,Trusty,meta,SRU] UBUNTU: Cleanup superfluous RELEASE_NAME logic

Message ID 1416342792-13064-3-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner Nov. 18, 2014, 8:33 p.m. UTC 
From: Tim Gardner <tim.gardner@canonical.com>

Remove superfluous logic that stream edits RELEASE_NAME. Also
corrects the VCS path Vcs-Git:
http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-trusty-meta.git

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 meta-source/debian/control.common       |  2 +-
 meta-source/debian/control.d/generic    | 28 ----------------------------
 meta-source/debian/control.d/lowlatency | 14 --------------
 meta-source/debian/rules                |  3 +--
 4 files changed, 2 insertions(+), 45 deletions(-)
diff mbox

Patch

diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
index 827dbec..b2a43de 100644
--- a/meta-source/debian/control.common
+++ b/meta-source/debian/control.common
@@ -4,7 +4,7 @@  Priority: optional
 Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
 Standards-Version: 3.6.1
 Build-Depends: dpkg (>= 1.13.19), debhelper (>= 5), gawk
-Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-RELEASE_NAME-meta.git
+Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-trusty-meta.git
 
 Package: linux-source
 Architecture: all
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..b64350c 100755
--- a/meta-source/debian/rules
+++ b/meta-source/debian/rules
@@ -7,7 +7,6 @@ 
 # Copyright (c) 2004 Jens Schmalzing <jensen@debian.org>
 #
 
-RELEASE_NAME=saucy
 HWE_KERNEL_NAME=utopic
 
 # 5 digit versions (2.6.38.<abi>.<upload>, 3 digit kernel base versions (2.6.38)
@@ -44,7 +43,7 @@  clean: debian/control
 debian/control: $(control_files)
 	rm -f debian/control.tmp
 	for i in $^; do \
-		sed -e 's/RELEASE_NAME/$(RELEASE_NAME)/g' -e 's/HWE_KERNEL_NAME/$(HWE_KERNEL_NAME)/g' $$i >> debian/control.tmp; \
+		sed -e 's/HWE_KERNEL_NAME/$(HWE_KERNEL_NAME)/g' $$i >> debian/control.tmp; \
 		echo >> debian/control.tmp; \
 	done
 	rm -f $@