From patchwork Tue Nov 20 20:50:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 200515 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 846182C00A3 for ; Wed, 21 Nov 2012 07:50:38 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Taum0-0005qK-Vv; Tue, 20 Nov 2012 20:50:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Tauly-0005pV-AG for kernel-team@lists.ubuntu.com; Tue, 20 Nov 2012 20:50:22 +0000 Received: from c-67-171-179-115.hsd1.or.comcast.net ([67.171.179.115] helo=adamo) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1Taulx-0004l4-UP for kernel-team@lists.ubuntu.com; Tue, 20 Nov 2012 20:50:22 +0000 Received: by adamo (Postfix, from userid 1000) id 63ACF20287; Tue, 20 Nov 2012 12:50:19 -0800 (PST) From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [Quantal][SRU][linux-meta][PATCH 2/2] UBUNTU: Move metapackages to Section: kernel Date: Tue, 20 Nov 2012 12:50:19 -0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Leann Ogasawara BugLink: http://bugs.launchpad.net/bugs/1074787 Packages built from linux-meta source are currently in Section: metapackages. The original rationale for this was that Recommends were handled differently for 'metapackages' (bug #114662). This rationale no longer applies and has not for a long time (all recommends are now installed by default). Instead, use of this section causes all *dependencies* of the linux metapackages to be marked as 'manual', preventing them from ever being cleaned up by apt autoremoval. Signed-off-by: Leann Ogasawara --- meta-source/debian/control.common | 6 +++--- meta-source/debian/control.d/generic | 6 +++--- meta-source/debian/control.d/generic-pae | 6 +++--- meta-source/debian/control.d/highbank | 6 +++--- meta-source/debian/control.d/omap | 6 +++--- meta-source/debian/control.d/powerpc-smp | 6 +++--- meta-source/debian/control.d/powerpc64-smp | 6 +++--- meta-source/debian/control.d/server | 6 +++--- meta-source/debian/control.d/signed-generic | 4 ++-- meta-source/debian/control.d/virtual | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common index 8299b65..9a3cd16 100644 --- a/meta-source/debian/control.common +++ b/meta-source/debian/control.common @@ -8,7 +8,7 @@ Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-quantal-meta.git Package: linux Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-${generic-depends} Description: Generic complete Linux kernel. @@ -26,7 +26,7 @@ Description: Linux kernel source with Ubuntu patches Package: linux-image Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-${generic-depends} Description: Generic Linux kernel image. @@ -49,7 +49,7 @@ Description: Linux kernel crashdump setup for the latest generic kernel Package: linux-tools Architecture: i386 amd64 armel armhf -Section: metapackages +Section: kernel Depends: ${misc:Depends}, linux-tools-${kernel-abi-version} Description: Linux kernel versioned Tools This package will always depend on the latest Linux kernel versioned tools diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic index ad144b2..9729e5d 100644 --- a/meta-source/debian/control.d/generic +++ b/meta-source/debian/control.d/generic @@ -1,6 +1,6 @@ Package: linux-headers-generic Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic Description: Generic Linux kernel headers @@ -9,7 +9,7 @@ Description: Generic Linux kernel headers Package: linux-image-generic Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-image-extra-${kernel-abi-version}-generic, linux-firmware Description: Generic Linux kernel image @@ -18,7 +18,7 @@ Description: Generic Linux kernel image Package: linux-generic Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-generic, linux-headers-generic Description: Complete Generic Linux kernel and headers diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae index 676dac8..51e7c91 100644 --- a/meta-source/debian/control.d/generic-pae +++ b/meta-source/debian/control.d/generic-pae @@ -1,6 +1,6 @@ Package: linux-headers-generic-pae Architecture: i386 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-headers-generic Description: Transitional package @@ -8,7 +8,7 @@ Description: Transitional package Package: linux-image-generic-pae Architecture: i386 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-generic Description: Transitional package @@ -16,7 +16,7 @@ Description: Transitional package Package: linux-generic-pae Architecture: i386 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-generic Description: Transitional package. diff --git a/meta-source/debian/control.d/highbank b/meta-source/debian/control.d/highbank index f730203..ea044c9 100644 --- a/meta-source/debian/control.d/highbank +++ b/meta-source/debian/control.d/highbank @@ -1,6 +1,6 @@ Package: linux-headers-highbank Architecture: armhf -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-highbank Description: Linux kernel headers for the highbank architecture. @@ -9,7 +9,7 @@ Description: Linux kernel headers for the highbank architecture. Package: linux-image-highbank Architecture: armhf -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-highbank, linux-firmware Description: Linux kernel image for the highbank architecture. @@ -18,7 +18,7 @@ Description: Linux kernel image for the highbank architecture. Package: linux-highbank Architecture: armhf -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-highbank, linux-headers-highbank Description: Complete Linux kernel for the highbank architecture. diff --git a/meta-source/debian/control.d/omap b/meta-source/debian/control.d/omap index e6a3024..9f91d19 100644 --- a/meta-source/debian/control.d/omap +++ b/meta-source/debian/control.d/omap @@ -1,6 +1,6 @@ Package: linux-headers-omap Architecture: armel armhf -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-omap Description: Linux kernel headers for the OMAP3 architecture. @@ -9,7 +9,7 @@ Description: Linux kernel headers for the OMAP3 architecture. Package: linux-image-omap Architecture: armel armhf -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-omap, linux-firmware Description: Linux kernel image for the OMAP3 architecture. @@ -18,7 +18,7 @@ Description: Linux kernel image for the OMAP3 architecture. Package: linux-omap Architecture: armel armhf -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-omap, linux-headers-omap Description: Complete Linux kernel for the OMAP3 architecture. diff --git a/meta-source/debian/control.d/powerpc-smp b/meta-source/debian/control.d/powerpc-smp index b24b8fb..da7b341 100644 --- a/meta-source/debian/control.d/powerpc-smp +++ b/meta-source/debian/control.d/powerpc-smp @@ -1,6 +1,6 @@ Package: linux-headers-powerpc-smp Architecture: powerpc -Section: metapackages +Section: kernel Priority: optional Depends: linux-headers-${kernel-abi-version}-powerpc-smp Description: Linux kernel headers on PowerPC SMP @@ -10,7 +10,7 @@ Description: Linux kernel headers on PowerPC SMP Package: linux-image-powerpc-smp Architecture: powerpc -Section: metapackages +Section: kernel Priority: optional Depends: linux-image-${kernel-abi-version}-powerpc-smp, linux-firmware Description: Linux kernel image on PowerPC SMP. @@ -20,7 +20,7 @@ Description: Linux kernel image on PowerPC SMP. Package: linux-powerpc-smp Architecture: powerpc -Section: metapackages +Section: kernel Priority: optional Depends: linux-image-powerpc-smp, linux-headers-powerpc-smp Description: Complete Linux kernel on PowerPC SMP. diff --git a/meta-source/debian/control.d/powerpc64-smp b/meta-source/debian/control.d/powerpc64-smp index 479fdd5..2ce06c7 100644 --- a/meta-source/debian/control.d/powerpc64-smp +++ b/meta-source/debian/control.d/powerpc64-smp @@ -1,6 +1,6 @@ Package: linux-headers-powerpc64-smp Architecture: powerpc -Section: metapackages +Section: kernel Priority: optional Depends: linux-headers-${kernel-abi-version}-powerpc64-smp Description: Linux kernel headers on PowerPC64 SMP @@ -10,7 +10,7 @@ Description: Linux kernel headers on PowerPC64 SMP Package: linux-image-powerpc64-smp Architecture: powerpc -Section: metapackages +Section: kernel Priority: optional Depends: linux-image-${kernel-abi-version}-powerpc64-smp, linux-firmware Description: Linux kernel image on PowerPC64 SMP. @@ -20,7 +20,7 @@ Description: Linux kernel image on PowerPC64 SMP. Package: linux-powerpc64-smp Architecture: powerpc -Section: metapackages +Section: kernel Priority: optional Depends: linux-image-powerpc64-smp, linux-headers-powerpc64-smp Description: Complete Linux kernel on PowerPC64 SMP. diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server index 33af60e..44c4615 100644 --- a/meta-source/debian/control.d/server +++ b/meta-source/debian/control.d/server @@ -1,6 +1,6 @@ Package: linux-headers-server Architecture: amd64 i386 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-headers-generic Description: Transitional package. @@ -8,7 +8,7 @@ Description: Transitional package. Package: linux-image-server Architecture: amd64 i386 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-generic Description: Transitional package. @@ -16,7 +16,7 @@ Description: Transitional package. Package: linux-server Architecture: amd64 i386 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-generic Description: Transitional package. diff --git a/meta-source/debian/control.d/signed-generic b/meta-source/debian/control.d/signed-generic index acd66f6..95cf1c4 100644 --- a/meta-source/debian/control.d/signed-generic +++ b/meta-source/debian/control.d/signed-generic @@ -1,6 +1,6 @@ Package: linux-signed-image-generic Architecture: amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-signed-image-${kernel-abi-version}-generic, linux-firmware Description: Signed Generic Linux kernel image @@ -9,7 +9,7 @@ Description: Signed Generic Linux kernel image Package: linux-signed-generic Architecture: amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-signed-image-generic, linux-headers-generic Description: Complete Signed Generic Linux kernel and headers diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual index 2a2bb47..e8d818b 100644 --- a/meta-source/debian/control.d/virtual +++ b/meta-source/debian/control.d/virtual @@ -1,6 +1,6 @@ Package: linux-headers-virtual Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-headers-generic Description: Transitional package. @@ -8,7 +8,7 @@ Description: Transitional package. Package: linux-image-virtual Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic Description: This package will always depend on the latest minimal generic kernel image. @@ -17,7 +17,7 @@ Description: This package will always depend on the latest minimal generic kerne Package: linux-virtual Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-virtual, linux-headers-virtual Description: Minimal Generic Linux kernel and headers @@ -26,7 +26,7 @@ Description: Minimal Generic Linux kernel and headers Package: linux-image-extra-virtual Architecture: i386 amd64 -Section: metapackages +Section: kernel Priority: optional Depends: ${misc:Depends}, linux-image-generic Description: Transitional package.