From patchwork Wed May 19 20:19:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 53022 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 99A76B6EFF for ; Thu, 20 May 2010 06:20:48 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OEpkt-0005UX-Qz; Wed, 19 May 2010 21:20:39 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OEpkr-0005US-PM for kernel-team@lists.ubuntu.com; Wed, 19 May 2010 21:20:38 +0100 Received: from [10.0.2.5] (unknown [10.0.2.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id 9356D243ABE; Wed, 19 May 2010 13:18:46 -0700 (PDT) Message-ID: <4BF447E7.8090204@canonical.com> Date: Wed, 19 May 2010 14:19:51 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4 MIME-Version: 1.0 To: Leann Ogasawara Subject: Maverick: Further abstraction of the source package name Cc: Kernel team list X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: tim.gardner@canonical.com List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This is kind of handy for the LTS backport work. rtg From d77772413c575c11cdb66f7806385a6d6a4e9064 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Wed, 19 May 2010 14:10:09 -0600 Subject: [PATCH] UBUNTU: [Config] Further abstraction of source package name. Signed-off-by: Tim Gardner --- debian.master/control.d/flavour-control.stub | 12 ++++++------ debian.master/control.stub.in | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub index a2d2a4d..3c41e61 100644 --- a/debian.master/control.d/flavour-control.stub +++ b/debian.master/control.d/flavour-control.stub @@ -21,12 +21,12 @@ # # XXX: Leave the blank line before the first package!! -Package: linux-image-PKGVER-ABINUM-FLAVOUR +Package: SRCPKGNAME-image-PKGVER-ABINUM-FLAVOUR Architecture: ARCH Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES= +Provides: SRCPKGNAME-image, SRCPKGNAME-image-2.6, fuse-module, =PROVIDES= Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Breaks: lvm2 (<< 2.02.54-1ubuntu3) @@ -45,10 +45,10 @@ Description: Linux kernel image for version PKGVER on DESC TARGET . You likely do not want to install this package directly. Instead, install - the linux-FLAVOUR meta-package, which will ensure that upgrades work + the SRCPKGNAME-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-PKGVER-ABINUM-FLAVOUR +Package: SRCPKGNAME-headers-PKGVER-ABINUM-FLAVOUR Architecture: ARCH Section: devel Priority: optional @@ -61,12 +61,12 @@ Description: Linux kernel headers for version PKGVER on DESC This is for sites that want the latest kernel headers. Please read /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details. -Package: linux-image-PKGVER-ABINUM-FLAVOUR-dbgsym +Package: SRCPKGNAME-image-PKGVER-ABINUM-FLAVOUR-dbgsym Architecture: ARCH Section: devel Priority: optional Depends: ${misc:Depends} -Provides: linux-debug +Provides: SRCPKGNAME-debug Description: Linux kernel debug image for version PKGVER on DESC This package provides a kernel debug image for version PKGVER on DESC. diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index d51aaba..6512c37 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -1,4 +1,4 @@ -Source: linux +Source: SRCPKGNAME Section: devel Priority: optional Maintainer: Ubuntu Kernel Team @@ -28,7 +28,7 @@ Description: Linux kernel source for version PKGVER with Ubuntu patches been designed to ease the task of creating kernel image packages. . If you are simply trying to build third-party modules for your kernel, - you do not want this package. Install the appropriate linux-headers + you do not want this package. Install the appropriate SRCPKGNAME-headers package instead. Package: SRCPKGNAME-doc @@ -55,7 +55,7 @@ Description: Linux kernel specific tools for version PKGVER This package provides the architecture independent parts for kernel version locked tools in the PKGVER kernel source. -Package: linux-headers-PKGVER-ABINUM +Package: SRCPKGNAME-headers-PKGVER-ABINUM Architecture: all Section: devel Priority: optional @@ -78,11 +78,11 @@ Description: Linux Kernel Headers for development libraries. They are NOT meant to be used to build third-party modules for your kernel. Use SRCPKGNAME-headers-* packages for that. -Package: linux-tools-PKGVER-ABINUM +Package: SRCPKGNAME-tools-PKGVER-ABINUM Architecture: i386 amd64 ia64 powerpc sparc armel Section: devel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common +Depends: ${misc:Depends}, ${shlibs:Depends}, SRCPKGNAME-tools-common Description: Linux kernel tools for version PKGVER-ABINUM This package provides the architecture dependant parts for kernel version locked tools for version PKGVER-ABINUM on -- 1.7.0.4