diff mbox

[v2,Quantal:,linux-meta] Fix the virtual dependencies

Message ID 4FD78DD8.4060607@canonical.com
State New
Headers show

Commit Message

Leann Ogasawara June 12, 2012, 6:43 p.m. UTC 
On 06/12/2012 10:38 AM, Stefan Bader wrote:
> As it came up during the server-team meeting, it seems that
> the stack of dependencies for virtual is probably not what
> it was intended to be.
>
> Note that I made additional changes based on the assumption
> that it would be good not to cross depend on any generic
> meta-packages. It feels that would blow up the stack without
> benefit and potentially confuses people.

The idea behind linux-virtual depending on the linux-generic meta
package was to eventually get us to a place where we could drop these
stub virtual meta packages in wholesale and just use the generic meta
packages across the board.  However, I can't see that being possible at
this time with how we've structured our meta packages, eg:

linux-<flavor> depends on linux-image-<flavor>, linux-headers-<flavor>

How about the following v2 of the patch (see attached).  It reinstates
the virtual meta package to depend on linux-image-virtual and
linux-headers-virtual.  This then follows the dependency model as all of
our other meta packages and also ensures we don't pull in the extra
bloat of the -extra's package.  I also adjusted some of the package
descriptions.

Thanks,
Leann

Comments

Tim Gardner June 12, 2012, 7 p.m. UTC | #1
Stefan Bader June 12, 2012, 7:04 p.m. UTC | #2 
Yeah, this would be enough I think.
Tim Gardner June 12, 2012, 7:14 p.m. UTC | #3
diff mbox

Patch

From 2a7d90a67e9d7cb5936ab7b76caa6ea6ecd89591 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Tue, 12 Jun 2012 11:17:54 -0700
Subject: [PATCH] UBUNTU: Fix linux-virtual meta package dependencies

BugLink: http://bugs.launchpad.net/bugs/1009553

Currently, linux-virtual depends on linux-generic which results in
both the linux-image and linux-image-extra packages being installed for
the virtual flavor.  This is not what was intended.  Fix linux-virtual
to depend on linux-image-virtual and linux-headers-virtual.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 meta-source/debian/control.d/virtual |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual
index 7ec994e..2a2bb47 100644
--- a/meta-source/debian/control.d/virtual
+++ b/meta-source/debian/control.d/virtual
@@ -11,7 +11,7 @@  Architecture: i386 amd64
 Section: metapackages
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic
-Description: This package will always depend on the latest generic kernel image.
+Description: This package will always depend on the latest minimal generic kernel image.
  This package will always depend on the latest minimal generic kernel image
  used for virtual instances.
 
@@ -19,9 +19,10 @@  Package: linux-virtual
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: ${misc:Depends}, linux-generic
-Description: Complete Generic Linux kernel and headers
- This package will always depend on linux-generic.
+Depends: ${misc:Depends}, linux-image-virtual, linux-headers-virtual
+Description: Minimal Generic Linux kernel and headers
+ This package will always depend on linux-image-virtual and
+ linux-headers-virtual.
 
 Package: linux-image-extra-virtual
 Architecture: i386 amd64
-- 
1.7.9.5