Bug#912170: stretch-pu: package grub2/2.02~beta3-5+deb9u1

2018-11-02 Thread Colin Watson 
On Thu, Nov 01, 2018 at 06:47:16PM +, Adam D. Barratt wrote:
> On Thu, 2018-11-01 at 19:20 +0100, Cyril Brulebois wrote:
> > Adam D. Barratt  (2018-10-28):
> > > This looks OK to me, but will need a KiBi-ack; tagging and CCing
> > > accordingly.
> > 
> > No objections, thanks.
> 
> Thanks. Colin - feel free to upload, bearing in mind that the window
> for getting fixes into the 9.6 point release closes this weekend.

Thanks.  Uploaded.

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

Bug#912170: stretch-pu: package grub2/2.02~beta3-5+deb9u1

2018-11-01 Thread Adam D. Barratt 
On Thu, 2018-11-01 at 19:20 +0100, Cyril Brulebois wrote:
> Hi,
> 
> Adam D. Barratt  (2018-10-28):
> > Control: tags -1 + confirmed d-i
> > 
> > On Sun, 2018-10-28 at 19:23 +, Colin Watson wrote:
> > > I have a couple of patches queued for stretch's grub2 which I
> > > think
> > > are low-risk and worth including: one of the fixed bugs makes it
> > > difficult to construct GRUB-based netboot environments on arm64,
> > > and
> > > the other makes it impossible to boot on Intel Apollo Lake
> > > systems.  The proposed debdiff is attached.
> > 
> > This looks OK to me, but will need a KiBi-ack; tagging and CCing
> > accordingly.
> 
> No objections, thanks.

Thanks. Colin - feel free to upload, bearing in mind that the window
for getting fixes into the 9.6 point release closes this weekend.

Regards,

Adam

Bug#912170: stretch-pu: package grub2/2.02~beta3-5+deb9u1

2018-11-01 Thread Cyril Brulebois 
Hi,

Adam D. Barratt  (2018-10-28):
> Control: tags -1 + confirmed d-i
> 
> On Sun, 2018-10-28 at 19:23 +, Colin Watson wrote:
> > I have a couple of patches queued for stretch's grub2 which I think
> > are low-risk and worth including: one of the fixed bugs makes it
> > difficult to construct GRUB-based netboot environments on arm64, and
> > the other makes it impossible to boot on Intel Apollo Lake
> > systems.  The proposed debdiff is attached.
> 
> This looks OK to me, but will need a KiBi-ack; tagging and CCing
> accordingly.

No objections, thanks.


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


signature.asc
Description: PGP signature

Bug#912170: stretch-pu: package grub2/2.02~beta3-5+deb9u1

2018-10-28 Thread Adam D. Barratt 
Control: tags -1 + confirmed d-i

On Sun, 2018-10-28 at 19:23 +, Colin Watson wrote:
> I have a couple of patches queued for stretch's grub2 which I think
> are low-risk and worth including: one of the fixed bugs makes it
> difficult to construct GRUB-based netboot environments on arm64, and
> the other makes it impossible to boot on Intel Apollo Lake
> systems.  The proposed debdiff is attached.

This looks OK to me, but will need a KiBi-ack; tagging and CCing
accordingly.

Thanks,

Adam

Bug#912170: stretch-pu: package grub2/2.02~beta3-5+deb9u1

2018-10-28 Thread Colin Watson 
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu

I have a couple of patches queued for stretch's grub2 which I think are
low-risk and worth including: one of the fixed bugs makes it difficult
to construct GRUB-based netboot environments on arm64, and the other
makes it impossible to boot on Intel Apollo Lake systems.  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-dpm2017-02-11 15:03:45.0 +
+++ grub2-2.02~beta3/debian/.git-dpm2018-10-28 19:16:13.0 +
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-9bf24c661aac96f62a7aef6ee41da4ca5ccf9b7a
-9bf24c661aac96f62a7aef6ee41da4ca5ccf9b7a
+f088c5a77750ef243888de09fd8cc979da9244bb
+f088c5a77750ef243888de09fd8cc979da9244bb
 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   2017-02-11 15:09:19.0 +
+++ grub2-2.02~beta3/debian/changelog   2018-10-28 19:18:13.0 +
@@ -1,3 +1,11 @@
+grub2 (2.02~beta3-5+deb9u1) stable; urgency=medium
+
+  * grub-mknetdir: Add support for ARM64 EFI (closes: #871772).
+  * Cherry-pick upstream patch to change the default TSC calibration method
+to pmtimer on EFI systems (closes: #908852).
+
+ -- Colin Watson   Sun, 28 Oct 2018 19:18:13 +
+
 grub2 (2.02~beta3-5) unstable; urgency=medium
 
   [ Steve McIntyre ]
diff -Nru grub2-2.02~beta3/debian/patches/mknetdir_arm64.patch 
grub2-2.02~beta3/debian/patches/mknetdir_arm64.patch
--- grub2-2.02~beta3/debian/patches/mknetdir_arm64.patch1970-01-01 
01:00:00.0 +0100
+++ grub2-2.02~beta3/debian/patches/mknetdir_arm64.patch2018-10-28 
19:16:13.0 +
@@ -0,0 +1,28 @@
+From 17c207ea005d5faaff9224d3aee34c0ee705a07d Mon Sep 17 00:00:00 2001
+From: Dirk Mueller 
+Date: Tue, 11 Oct 2016 22:19:02 +0200
+Subject: grub-mknetdir: Add support for ARM64 EFI
+
+Origin: upstream, 
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=0d663b50b9abf830fd10de384606a0632a605b77
+Bug-Debian: https://bugs.debian.org/871772
+Last-Update: 2017-08-26
+
+Patch-Name: mknetdir_arm64.patch
+---
+ util/grub-mknetdir.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
+index 3813e8bc0..82073d5cc 100644
+--- a/util/grub-mknetdir.c
 b/util/grub-mknetdir.c
+@@ -106,7 +106,8 @@ static const struct
+ [GRUB_INSTALL_PLATFORM_I386_EFI] = { "i386-efi", "efinet", ".efi" },
+ [GRUB_INSTALL_PLATFORM_X86_64_EFI] = { "x86_64-efi", "efinet", ".efi" },
+ [GRUB_INSTALL_PLATFORM_IA64_EFI] = { "ia64-efi", "efinet", ".efi" },
+-[GRUB_INSTALL_PLATFORM_ARM_EFI] = { "arm-efi", "efinet", ".efi" }
++[GRUB_INSTALL_PLATFORM_ARM_EFI] = { "arm-efi", "efinet", ".efi" },
++[GRUB_INSTALL_PLATFORM_ARM64_EFI] = { "arm64-efi", "efinet", ".efi" }
+   };
+ 
+ static void
diff -Nru grub2-2.02~beta3/debian/patches/series 
grub2-2.02~beta3/debian/patches/series
--- grub2-2.02~beta3/debian/patches/series  2017-02-11 15:03:45.0 
+
+++ grub2-2.02~beta3/debian/patches/series  2018-10-28 19:16:13.0 
+
@@ -57,3 +57,5 @@
 efinet_set_network_from_uefi_devpath.patch
 efinet_set_dns_from_uefi_proto.patch
 grub-install-efibootmgr-check.patch
+mknetdir_arm64.patch
+tsc_efi_default_to_pmtimer.patch
diff -Nru grub2-2.02~beta3/debian/patches/tsc_efi_default_to_pmtimer.patch 
grub2-2.02~beta3/debian/patches/tsc_efi_default_to_pmtimer.patch
--- grub2-2.02~beta3/debian/patches/tsc_efi_default_to_pmtimer.patch
1970-01-01 01:00:00.0 +0100
+++ grub2-2.02~beta3/debian/patches/tsc_efi_default_to_pmtimer.patch
2018-10-28 19:16:13.0 +
@@ -0,0 +1,34 @@
+From f088c5a77750ef243888de09fd8cc979da9244bb Mon Sep 17 00:00:00 2001
+From: "David E. Box" 
+Date: Fri, 15 Sep 2017 15:37:05 -0700
+Subject: tsc: Change default tsc calibration method to pmtimer on EFI systems
+
+On efi systems, make pmtimer based tsc calibration the default over the
+pit. This prevents Grub from hanging on Intel SoC systems that power gate
+the pit.
+
+Signed-off-by: David E. Box 
+Reviewed-by: Daniel Kiper 
+
+Origin: upstream, 
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=446794de8da4329ea532cbee4ca877bcafd0e534
+Bug-Debian: https://bugs.debian.org/883193
+Last-Update: 2018-10-28
+
+Patch-Name: tsc_efi_default_to_pmtimer.patch
+---
+ grub-core/kern/i386/tsc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c
+index 2e85289d8..f266eb131 100644
+--- a/grub-core/kern/i386/tsc.c
 b/grub-core/kern/i386/tsc.c
+@@ -68,7 +68,7 @@ grub_tsc_init (void)
+ #ifdef