Patchwork [Quantal,linux-meta] Prevent linux-crashdump from replacing grub-efi

login
register
mail settings
Submitter Stefan Bader
Date Oct. 9, 2012, 10:22 a.m.
Message ID <1349778127-29034-1-git-send-email-stefan.bader@canonical.com>
Download mbox | patch
Permalink /patch/190262/
State New
Headers show

Comments

Stefan Bader - Oct. 9, 2012, 10:22 a.m.
BugLink: http://bugs.launchpad.net/bugs/1064259

When playing with linux-crashdump on an EFI installed system I realized
that grub-efi was thrown away and replaced by grub-pc which did not
seem to good.

Apparently we do not consider grub-efi as an alternative in the
depends. With this added (I took the version of grub-efi in Lucid)
at least grub-efi remains installed and a normal boot still works.

Only the actual crash-dump seems to explode on this system with
backtraces showing a log of xhci... /me bangs head.

Still it sounds like we probably want to add this to meta packages
for P and L at least.. and Q of course...

-Stefan


From 1b53289d1e4be597b2d865d0ed89465853ee2950 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Tue, 9 Oct 2012 11:31:30 +0200
Subject: [PATCH] UBUNTU: Ubuntu-3.5.0.17.19

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 meta-source/debian/changelog      |    7 +++++++
 meta-source/debian/control.common |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
Andy Whitcroft - Oct. 9, 2012, 11:38 a.m.
On Tue, Oct 09, 2012 at 12:22:07PM +0200, Stefan Bader wrote:
> BugLink: http://bugs.launchpad.net/bugs/1064259
> 
> When playing with linux-crashdump on an EFI installed system I realized
> that grub-efi was thrown away and replaced by grub-pc which did not
> seem to good.
> 
> Apparently we do not consider grub-efi as an alternative in the
> depends. With this added (I took the version of grub-efi in Lucid)
> at least grub-efi remains installed and a normal boot still works.
> 
> Only the actual crash-dump seems to explode on this system with
> backtraces showing a log of xhci... /me bangs head.
> 
> Still it sounds like we probably want to add this to meta packages
> for P and L at least.. and Q of course...

It cirtainly seems inappropriate to be removing grub-efi to install
anything, ever :).

> 
> From 1b53289d1e4be597b2d865d0ed89465853ee2950 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader@canonical.com>
> Date: Tue, 9 Oct 2012 11:31:30 +0200
> Subject: [PATCH] UBUNTU: Ubuntu-3.5.0.17.19
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  meta-source/debian/changelog      |    7 +++++++
>  meta-source/debian/control.common |    2 +-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog
> index bb83f7a..47edf88 100644
> --- a/meta-source/debian/changelog
> +++ b/meta-source/debian/changelog
> @@ -1,3 +1,10 @@
> +linux-meta (3.5.0.17.19) quantal-proposed; urgency=low
> +
> +  * Make linux-crashdump alternatively depend on grub-efi.
> +    LP: #1064259
> +
> + -- Stefan Bader <stefan.bader@canonical.com>  Tue, 09 Oct 2012 11:28:08 +0200
> +
>  linux-meta (3.5.0.17.18) quantal-proposed; urgency=low
>  
>    * Add new meta-packages for linux-signed-* images.
> diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
> index 725b34d..5273800 100644
> --- a/meta-source/debian/control.common
> +++ b/meta-source/debian/control.common
> @@ -36,7 +36,7 @@ Description: Generic Linux kernel image.
>  Package: linux-crashdump
>  Architecture: i386 amd64
>  Section: devel
> -Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub (>= 0.97-29ubuntu24)
> +Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub-efi (>= 1.98-1ubuntu5) | grub (>= 0.97-29ubuntu24)

How did you choose this version of grub-efi, it seems arbitrary from
outside.

But asssuming that this is a meaningful version:

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Stefan Bader - Oct. 9, 2012, 12:35 p.m.
On 09.10.2012 13:38, Andy Whitcroft wrote:
> On Tue, Oct 09, 2012 at 12:22:07PM +0200, Stefan Bader wrote:
>> BugLink: http://bugs.launchpad.net/bugs/1064259
>>
>> When playing with linux-crashdump on an EFI installed system I realized
>> that grub-efi was thrown away and replaced by grub-pc which did not
>> seem to good.
>>
>> Apparently we do not consider grub-efi as an alternative in the
>> depends. With this added (I took the version of grub-efi in Lucid)
>> at least grub-efi remains installed and a normal boot still works.
>>
>> Only the actual crash-dump seems to explode on this system with
>> backtraces showing a log of xhci... /me bangs head.
>>
>> Still it sounds like we probably want to add this to meta packages
>> for P and L at least.. and Q of course...
> 
> It cirtainly seems inappropriate to be removing grub-efi to install
> anything, ever :).
> 
>>
>> From 1b53289d1e4be597b2d865d0ed89465853ee2950 Mon Sep 17 00:00:00 2001
>> From: Stefan Bader <stefan.bader@canonical.com>
>> Date: Tue, 9 Oct 2012 11:31:30 +0200
>> Subject: [PATCH] UBUNTU: Ubuntu-3.5.0.17.19
>>
>> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
>> ---
>>  meta-source/debian/changelog      |    7 +++++++
>>  meta-source/debian/control.common |    2 +-
>>  2 files changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog
>> index bb83f7a..47edf88 100644
>> --- a/meta-source/debian/changelog
>> +++ b/meta-source/debian/changelog
>> @@ -1,3 +1,10 @@
>> +linux-meta (3.5.0.17.19) quantal-proposed; urgency=low
>> +
>> +  * Make linux-crashdump alternatively depend on grub-efi.
>> +    LP: #1064259
>> +
>> + -- Stefan Bader <stefan.bader@canonical.com>  Tue, 09 Oct 2012 11:28:08 +0200
>> +
>>  linux-meta (3.5.0.17.18) quantal-proposed; urgency=low
>>  
>>    * Add new meta-packages for linux-signed-* images.
>> diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
>> index 725b34d..5273800 100644
>> --- a/meta-source/debian/control.common
>> +++ b/meta-source/debian/control.common
>> @@ -36,7 +36,7 @@ Description: Generic Linux kernel image.
>>  Package: linux-crashdump
>>  Architecture: i386 amd64
>>  Section: devel
>> -Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub (>= 0.97-29ubuntu24)
>> +Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub-efi (>= 1.98-1ubuntu5) | grub (>= 0.97-29ubuntu24)
> 
> How did you choose this version of grub-efi, it seems arbitrary from
> outside.

As I wrote, this is the version of grub-efi in the release pocket of Lucid (oh
well maybe I did not verbosely enough). The other grub versions are based on
something post-Hardy. Right now Lucid is the next number to that, that I could
easily find.

> 
> But asssuming that this is a meaningful version:
> 
> Acked-by: Andy Whitcroft <apw@canonical.com>
> 
> -apw
>
Herton Ronaldo Krzesinski - Oct. 9, 2012, 1:27 p.m.

Tim Gardner - Oct. 9, 2012, 1:35 p.m.
uploaded
Stefan Bader - Oct. 9, 2012, 5:58 p.m.
The following two patches are for precise and lucid meta and
making the same changes as for quantal.
Compile but not install tested as my EFI machine does not like
"older" releases that much. But one would not expect the
behaviour to be different.

Note, it seems the backports and ec2 branches in meta are good
as they do not produce the linux-crashdump meta-package.

-Stefan
Tim Gardner - Oct. 9, 2012, 6:37 p.m.

Herton Ronaldo Krzesinski - Oct. 9, 2012, 8:20 p.m.

Tim Gardner - Oct. 11, 2012, 5:32 p.m.
Herton - I've pushed but not uploaded. Dunno if you want to upload
directly to the archive or to the c-k-t PPA.
Herton Ronaldo Krzesinski - Oct. 11, 2012, 5:52 p.m.
On Thu, Oct 11, 2012 at 11:32:19AM -0600, Tim Gardner wrote:
> Herton - I've pushed but not uploaded. Dunno if you want to upload
> directly to the archive or to the c-k-t PPA.

I think we can skip this upload, and upload with the abi bump that will
be needed when we do the new kernels next week. Also the changelog needs
fixing (has UNRELEASED instead of precise-proposed), so it would need a
repush/retag for uploading the current one.

So I would say the best is to avoid uploading now and just adding a new
entry/version with abi bump, fixing the UNRELEASED, and uploading next
week the new version.

> 
> -- 
> Tim Gardner tim.gardner@canonical.com
>
Tim Gardner - Oct. 11, 2012, 6:12 p.m.
On 10/11/2012 11:52 AM, Herton Ronaldo Krzesinski wrote:
> 
> So I would say the best is to avoid uploading now and just adding a new
> entry/version with abi bump, fixing the UNRELEASED, and uploading next
> week the new version.
> 

That works for me.
Stefan Bader - Oct. 12, 2012, 7:19 a.m.
On 11.10.2012 19:52, Herton Ronaldo Krzesinski wrote:
> On Thu, Oct 11, 2012 at 11:32:19AM -0600, Tim Gardner wrote:
>> Herton - I've pushed but not uploaded. Dunno if you want to upload
>> directly to the archive or to the c-k-t PPA.
> 
> I think we can skip this upload, and upload with the abi bump that will
> be needed when we do the new kernels next week. Also the changelog needs
> fixing (has UNRELEASED instead of precise-proposed), so it would need a
> repush/retag for uploading the current one.
> 
> So I would say the best is to avoid uploading now and just adding a new
> entry/version with abi bump, fixing the UNRELEASED, and uploading next
> week the new version.

Actually the UNRELEASED was deliberate (as well as not having a tag. To allow
you to add other (like the ABI bump) updates and set the release when you really
finish things up for a release. :)

-Stefan
> 
>>
>> -- 
>> Tim Gardner tim.gardner@canonical.com
>>
>

Patch

diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog
index bb83f7a..47edf88 100644
--- a/meta-source/debian/changelog
+++ b/meta-source/debian/changelog
@@ -1,3 +1,10 @@ 
+linux-meta (3.5.0.17.19) quantal-proposed; urgency=low
+
+  * Make linux-crashdump alternatively depend on grub-efi.
+    LP: #1064259
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Tue, 09 Oct 2012 11:28:08 +0200
+
 linux-meta (3.5.0.17.18) quantal-proposed; urgency=low
 
   * Add new meta-packages for linux-signed-* images.
diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
index 725b34d..5273800 100644
--- a/meta-source/debian/control.common
+++ b/meta-source/debian/control.common
@@ -36,7 +36,7 @@  Description: Generic Linux kernel image.
 Package: linux-crashdump
 Architecture: i386 amd64
 Section: devel
-Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub (>= 0.97-29ubuntu24)
+Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub-efi (>= 1.98-1ubuntu5) | grub (>= 0.97-29ubuntu24)
 Recommends: apport
 Suggests: crash
 Description: Linux kernel crashdump setup for the latest generic kernel