diff options
| author | Andy Whitcroft <apw@canonical.com> | 2009-07-21 11:25:00 +0100 |
|---|---|---|
| committer | Andy Whitcroft <apw@canonical.com> | 2009-07-21 11:53:20 +0100 |
| commit | 474f93e1ac35dd0b9fcb7874892608c0dbbffb60 (patch) | |
| tree | 9665d6acab3a094990552ffa4394c545f29bb3b8 /meta-source | |
| parent | 110f8e326e4547ab68331200884ac0110238436f (diff) | |
fix dependancies for i386 virtual kernel
BugLink: http://bugs.launchpad.net/bugs/399914
Currently the -virtual kernel headers and LBM point unconditionally to
the -server kernel versions. This leads to uninstallable packages:
linux-meta 2.6.31.3.14 produces uninstallable binaries:
* linux-backports-modules-karmic-virtual (i386)
* linux-headers-virtual (i386) `
Point the i386 -virtual entries to the i386 -generic-pae ones.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'meta-source')
| -rw-r--r-- | meta-source/debian/changelog | 9 | ||||
| -rw-r--r-- | meta-source/debian/control | 4 | ||||
| -rw-r--r-- | meta-source/debian/control.d/virtual | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog index ee28423..3f5944a 100644 --- a/meta-source/debian/changelog +++ b/meta-source/debian/changelog @@ -1,3 +1,12 @@ +linux-meta (2.6.31.3.15) UNRELEASED; urgency=low + + [ Andy Whitcroft ] + + * fix dependancies for i386 virtual kernel + - LP: #399914 + + -- Andy Whitcroft <apw@canonical.com> Tue, 21 Jul 2009 11:47:11 +0100 + linux-meta (2.6.31.3.14) karmic; urgency=low * Karmic ABI 3 diff --git a/meta-source/debian/control b/meta-source/debian/control index 4349c4c..112c9bb 100644 --- a/meta-source/debian/control +++ b/meta-source/debian/control @@ -230,7 +230,7 @@ Package: linux-headers-virtual Architecture: i386 amd64 Section: devel Priority: optional -Depends: linux-headers-${kernel-abi-version}-server +Depends: linux-headers-${kernel-abi-version}-server | linux-headers-${kernel-abi-version}-generic-pae Description: Linux kernel headers for virtual machines This package will always depend on the latest kernel headers available for virtual machines (which are the same headers as for the server flavour). @@ -255,7 +255,7 @@ Description: Complete Linux kernel for virtual machines Package: linux-backports-modules-karmic-virtual Architecture: amd64 i386 -Depends: linux-backports-modules-${kernel-abi-version}-server +Depends: linux-backports-modules-${kernel-abi-version}-server | linux-backports-modules-${kernel-abi-version}-generic-pae Description: Backported drivers for virtual kernel image This empty package allows people to keep their backported modules up-to-date when upgrading their Linux kernel. diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual index 9a7d8ed..7b330e6 100644 --- a/meta-source/debian/control.d/virtual +++ b/meta-source/debian/control.d/virtual @@ -2,7 +2,7 @@ Package: linux-headers-virtual Architecture: i386 amd64 Section: devel Priority: optional -Depends: linux-headers-${kernel-abi-version}-server +Depends: linux-headers-${kernel-abi-version}-server | linux-headers-${kernel-abi-version}-generic-pae Description: Linux kernel headers for virtual machines This package will always depend on the latest kernel headers available for virtual machines (which are the same headers as for the server flavour). @@ -27,7 +27,7 @@ Description: Complete Linux kernel for virtual machines Package: linux-backports-modules-RELEASE_NAME-virtual Architecture: amd64 i386 -Depends: linux-backports-modules-${kernel-abi-version}-server +Depends: linux-backports-modules-${kernel-abi-version}-server | linux-backports-modules-${kernel-abi-version}-generic-pae Description: Backported drivers for virtual kernel image This empty package allows people to keep their backported modules up-to-date when upgrading their Linux kernel. |