Bug#930420: stretch-pu: package grub2/2.02~beta3-5+deb9u2

[Colin Watson]

On Sat, Jul 27, 2019 at 12:39:40PM +0200, Cyril Brulebois wrote:
> Adam D. Barratt  (2019-07-26):
> > Sorry for the delay in getting back to you regarding this.
> > 
> > While it doesn't sound like the changes should affect d-i, I would
> > still appreciate an ack on that side, so tagging and CCing
> > appropriately.
> 
> No objections, thanks.

Uploaded, thanks.

-- 
Colin Watson   [cjwat...@debian.org]

Bug#930420: stretch-pu: package grub2/2.02~beta3-5+deb9u2

[Cyril Brulebois]

Adam D. Barratt  (2019-07-26):
> Sorry for the delay in getting back to you regarding this.
> 
> While it doesn't sound like the changes should affect d-i, I would
> still appreciate an ack on that side, so tagging and CCing
> appropriately.

No objections, thanks.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#930420: stretch-pu: package grub2/2.02~beta3-5+deb9u2

[Adam D. Barratt]

Control: tags -1 + confirmed d-i

On 2019-06-12 08:29, Colin Watson wrote:

I'd like to upload an update to stretch's grub2 which adds support for
booting Xen on UEFI hosts.  This consists of four straight cherry-picks
from upstream (somewhat complex, but mostly confined to the multiboot
loader so IMO low-risk for other boot methods) and one cherry-pick of a
an upstream backport that I'd previously done for buster.  It was
requested by and has been tested by an upstream Xen developer.  The
proposed debdiff is attached.


Sorry for the delay in getting back to you regarding this.

While it doesn't sound like the changes should affect d-i, I would still 
appreciate an ack on that side, so tagging and CCing appropriately.


Regards,

Adam

Bug#930420: stretch-pu: package grub2/2.02~beta3-5+deb9u2

[Colin Watson]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu

I'd like to upload an update to stretch's grub2 which adds support for
booting Xen on UEFI hosts.  This consists of four straight cherry-picks
from upstream (somewhat complex, but mostly confined to the multiboot
loader so IMO low-risk for other boot methods) and one cherry-pick of a
an upstream backport that I'd previously done for buster.  It was
requested by and has been tested by an upstream Xen developer.  The
proposed debdiff is attached.

Thanks,

-- 
Colin Watson   [cjwat...@debian.org]
diff -Nru grub2-2.02~beta3/debian/.git-dpm grub2-2.02~beta3/debian/.git-dpm
--- grub2-2.02~beta3/debian/.git-dpm2018-10-28 19:18:13.0 +
+++ grub2-2.02~beta3/debian/.git-dpm2019-06-12 12:20:28.0 +0100
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-f088c5a77750ef243888de09fd8cc979da9244bb
-f088c5a77750ef243888de09fd8cc979da9244bb
+23439d60d742949cee70df3c1b84ac61c9ce2c0d
+23439d60d742949cee70df3c1b84ac61c9ce2c0d
 422889f9199d539926099fc5c1ceeeda51ab7f53
 422889f9199d539926099fc5c1ceeeda51ab7f53
 grub2_2.02~beta3.orig.tar.xz
diff -Nru grub2-2.02~beta3/debian/changelog grub2-2.02~beta3/debian/changelog
--- grub2-2.02~beta3/debian/changelog   2018-10-28 19:18:13.0 +
+++ grub2-2.02~beta3/debian/changelog   2019-06-12 12:20:51.0 +0100
@@ -1,3 +1,16 @@
+grub2 (2.02~beta3-5+deb9u2) stable; urgency=medium
+
+  * Cherry-pick upstream patches for Xen UEFI support (closes: #930028):
+- i386/relocator: Add grub_relocator64_efi relocator
+- multiboot2: Add tags used to pass ImageHandle to loaded image
+- multiboot2: Do not pass memory maps to image if EFI boot services are
+  enabled
+- multiboot2: Add support for relocatable images
+- Use grub-file to figure out whether multiboot2 should be used for
+  Xen.gz
+
+ -- Colin Watson   Wed, 12 Jun 2019 12:20:51 +0100
+
 grub2 (2.02~beta3-5+deb9u1) stable; urgency=medium
 
   * grub-mknetdir: Add support for ARM64 EFI (closes: #871772).
diff -Nru 
grub2-2.02~beta3/debian/patches/add-grub_relocator64_efi-relocator.patch 
grub2-2.02~beta3/debian/patches/add-grub_relocator64_efi-relocator.patch
--- grub2-2.02~beta3/debian/patches/add-grub_relocator64_efi-relocator.patch
1970-01-01 01:00:00.0 +0100
+++ grub2-2.02~beta3/debian/patches/add-grub_relocator64_efi-relocator.patch
2019-06-12 12:20:28.0 +0100
@@ -0,0 +1,360 @@
+From 94f7fe2201bc37170b7cf4f18378386b15c6955c Mon Sep 17 00:00:00 2001
+From: Daniel Kiper 
+Date: Fri, 17 Jul 2015 19:43:42 +0200
+Subject: i386/relocator: Add grub_relocator64_efi relocator
+
+Add grub_relocator64_efi relocator. It will be used on EFI 64-bit platforms
+when multiboot2 compatible image requests MULTIBOOT_TAG_TYPE_EFI_BS. Relocator
+will set lower parts of %rax and %rbx accordingly to multiboot2 specification.
+On the other hand processor mode, just before jumping into loaded image, will
+be set accordingly to Unified Extensible Firmware Interface Specification,
+Version 2.4 Errata B, section 2.3.4, x64 Platforms, boot services. This way
+loaded image will be able to use EFI boot services without any issues.
+
+Signed-off-by: Daniel Kiper 
+Reviewed-by: Konrad Rzeszutek Wilk 
+Reviewed-by: Vladimir Serbinenko 
+
+Origin: upstream, 
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=9862b241212b25ee23f60f5bcc4277d2289eaaf9
+Bug-Debian: https://bugs.debian.org/930028
+Last-Update: 2019-06-12
+
+Patch-Name: add-grub_relocator64_efi-relocator.patch
+---
+ grub-core/Makefile.core.def  |  1 +
+ grub-core/lib/i386/relocator64.S | 11 +
+ grub-core/lib/x86_64/efi/relocator.c | 80 
+ grub-core/loader/multiboot.c | 51 ---
+ grub-core/loader/multiboot_mbi2.c| 19 +++--
+ include/grub/i386/multiboot.h| 11 +
+ include/grub/i386/relocator.h| 21 ++
+ include/multiboot2.h |  1 +
+ 8 files changed, 186 insertions(+), 9 deletions(-)
+ create mode 100644 grub-core/lib/x86_64/efi/relocator.c
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 6b047109b..8052f68d3 100644
+--- a/grub-core/Makefile.core.def
 b/grub-core/Makefile.core.def
+@@ -1540,6 +1540,7 @@ module = {
+   i386_xen = lib/i386/xen/relocator.S;
+   x86_64_xen = lib/x86_64/xen/relocator.S;
+   xen = lib/i386/relocator_common_c.c;
++  x86_64_efi = lib/x86_64/efi/relocator.c;
+ 
+   extra_dist = lib/i386/relocator_common.S;
+   extra_dist = kern/powerpc/cache_flush.S;
+diff --git a/grub-core/lib/i386/relocator64.S 
b/grub-core/lib/i386/relocator64.S
+index e4648d818..75725cf75 100644
+--- a/grub-core/lib/i386/relocator64.S
 b/grub-core/lib/i386/relocator64.S
+@@ -73,6 +73,14 @@ VARIABLE(grub_relocator64_rsp)
+ 
+   movq%rax, %rsp
+ 
++  /*
++   * Here is grub_relocator64_efi_