Merge ~xnox/grub:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Dimitri John Ledkov]

Fixes

dc57667... by Dimitri John Ledkov on 2021-07-16

releasing package grub2 version 2.04-1ubuntu46

Unmerged commits

dc57667... by Dimitri John Ledkov on 2021-07-16

releasing package grub2 version 2.04-1ubuntu46

cac893c... by Dimitri John Ledkov on 2021-07-16

grub-initrd-fallback.service, debian/grub-common.service: only start units when booted with grub. Use presence of /boot/grub/grub.cfg as proxy. LP: #1925507

f01c19a... by Dimitri John Ledkov on 2021-07-15

debian/rules: disable LTO. LP: #1922005

484afe3... by Dimitri John Ledkov on 2021-07-15

cherrypick upstream fix to make armhf efi boot work. LP: #1788940

f1a3e2b... by Dimitri John Ledkov on 2021-07-15

grub-initrd-fallback.service: add wantedby sleep.target, after
sleep.target. The service will now start after resume from
hybernation. LP: #1929860

0497a42... by Dimitri John Ledkov on 2021-07-15

debian/grub-common.service: change type to oneshot, add wantedby sleep.target, after sleep.target. The service will now start after resume from hybernation.

LP: #1929860

9389967... by Dimitri John Ledkov on 2021-03-30

releasing package grub2 version 2.04-1ubuntu45

22f99c4... by Dimitri John Ledkov on 2021-03-30

Drop redundant dh-systemd build-dependency.

3945b11... by Dimitri John Ledkov on 2021-03-30

Unapply all patches.

* Unapply all patches.
* Stop using git-dpm.
* Start using gbp pq import|export --no-patch-numbers, this brings grub2
  packaging closer to other non-debian distributions.
* It would be nice to separate patches into topic subdirs -
  i.e. reverts, upstream cherry picks, debian, ubuntu, rhel, security,
  etc.

9d35931... by Dimitri John Ledkov on 2021-03-30

Import uploads upto 2.04-1ubuntu44

diff --git a/debian/changelog b/debian/changelog
index ab465cf..d69daca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+grub2 (2.04-1ubuntu46) impish; urgency=medium
+
+  * debian/grub-common.service: change type to oneshot, add wantedby
+    sleep.target, after sleep.target. The service will now start after
+    resume from hybernation. LP: #1929860
+  * grub-initrd-fallback.service: add wantedby sleep.target, after
+    sleep.target. The service will now start after resume from
+    hybernation. LP: #1929860
+  * cherrypick upstream fix to make armhf efi boot work. LP: #1788940
+  * debian/rules: disable LTO. LP: #1922005
+  * grub-initrd-fallback.service, debian/grub-common.service: only start
+    units when booted with grub. Use presence of /boot/grub/grub.cfg as
+    proxy. LP: #1925507
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 16 Jul 2021 12:02:33 +0100
+
 grub2 (2.04-1ubuntu45) hirsute; urgency=medium
 
   * Unapply all patches.
diff --git a/debian/grub-common.service b/debian/grub-common.service
index afe1aa0..fcf5474 100644
--- a/debian/grub-common.service
+++ b/debian/grub-common.service
@@ -1,14 +1,15 @@
 [Unit]
 Description=Record successful boot for GRUB
+After=sleep.target
+ConditionPathExists=/boot/grub/grub.cfg
 
 [Service]
-Type=simple
+Type=oneshot
 Restart=no
-RemainAfterExit=yes
 ExecStartPre=/bin/sh -c '[ -s /boot/grub/grubenv ] || rm -f /boot/grub/grubenv; mkdir -p /boot/grub'
 ExecStart=grub-editenv /boot/grub/grubenv unset recordfail
 ExecStartPost=/bin/sh -c 'if grub-editenv /boot/grub/grubenv list | grep -q initrdless_boot_fallback_triggered=1; then echo "grub: GRUB_FORCE_PARTUUID set, initrdless boot paniced, fallback triggered."; fi'
 StandardOutput=kmsg
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target sleep.target
diff --git a/debian/patches/0239-arm-linux-Fix-ARM-Linux-header-layout.patch b/debian/patches/0239-arm-linux-Fix-ARM-Linux-header-layout.patch
new file mode 100644
index 0000000..5de0f28
--- /dev/null
+++ b/debian/patches/0239-arm-linux-Fix-ARM-Linux-header-layout.patch
@@ -0,0 +1,29 @@
+From: Ard Biesheuvel <[e-mail]>
+Date: Sun, 25 Oct 2020 14:49:34 +0100
+Subject: arm/linux: Fix ARM Linux header layout
+
+The hdr_offset member of the ARM Linux image header appears at
+offset 0x3c, matching the PE/COFF spec's placement of the COFF
+header offset in the MS-DOS header. We're currently off by four,
+so fix that.
+
+Signed-off-by: Ard Biesheuvel <[e-mail]>
+Reviewed-by: Daniel Kiper <[e-mail]>
+(cherry picked from commit a166484483a94f6a414c09a1e449d51fb1beaf05)
+---
+ include/grub/arm/linux.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
+index 2e98a66..bcd5a7e 100644
+--- a/include/grub/arm/linux.h
++++ b/include/grub/arm/linux.h
+@@ -30,7 +30,7 @@ struct linux_arm_kernel_header {
+   grub_uint32_t magic;
+   grub_uint32_t start; /* _start */
+   grub_uint32_t end;   /* _edata */
+-  grub_uint32_t reserved2[4];
++  grub_uint32_t reserved2[3];
+   grub_uint32_t hdr_offset;
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0f5fcee..c8e44f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -236,3 +236,4 @@ cherry-fix-crash-on-http.patch
 0236-gdb-Restrict-GDB-access-when-locked-down.patch
 0237-loader-xnu-Don-t-allow-loading-extension-and-package.patch
 0238-util-grub-install-Fix-NULL-pointer-dereferences.patch
+0239-arm-linux-Fix-ARM-Linux-header-layout.patch
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
index 82abad4..270a20f 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
@@ -11,10 +11,10 @@ Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch
 ---
  Makefile.am                  |  3 ++
  configure.ac                 | 10 +++++++
- grub-initrd-fallback.service | 13 +++++++++
+ grub-initrd-fallback.service | 14 +++++++++
  util/grub.d/00_header.in     | 27 ++++++++++++++++++
  util/grub.d/10_linux.in      | 68 +++++++++++++++++++++++++++++++++-----------
- 5 files changed, 105 insertions(+), 16 deletions(-)
+ 5 files changed, 106 insertions(+), 16 deletions(-)
  create mode 100644 grub-initrd-fallback.service
 
 diff --git a/Makefile.am b/Makefile.am
@@ -54,14 +54,15 @@ index 8832455..1819188 100644
  #
 diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
 new file mode 100644
-index 0000000..fb0b76e
+index 0000000..1a0a4e5
 --- /dev/null
 +++ b/grub-initrd-fallback.service
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
 +[Unit]
 +Description=GRUB failed boot detection
 +After=local-fs.target
 +After=grub-common.service
++After=sleep.target
 +
 +[Service]
 +Type=oneshot
@@ -70,7 +71,7 @@ index 0000000..fb0b76e
 +TimeoutSec=0
 +
 +[Install]
-+WantedBy=multi-user.target rescue.target emergency.target
++WantedBy=multi-user.target rescue.target emergency.target sleep.target
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
 index b7135b6..2642f66 100644
 --- a/util/grub.d/00_header.in
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-messages.patch b/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
index 23ce23d..c81740b 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
@@ -8,9 +8,22 @@ reboot by default.
 
 Patch-Name: ubuntu-add-initrd-less-boot-messages.patch
 ---
- util/grub.d/10_linux.in | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ grub-initrd-fallback.service |  1 +
+ util/grub.d/10_linux.in      | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
 
+diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
+index 1a0a4e5..59d1a62 100644
+--- a/grub-initrd-fallback.service
++++ b/grub-initrd-fallback.service
+@@ -3,6 +3,7 @@ Description=GRUB failed boot detection
+ After=local-fs.target
+ After=grub-common.service
+ After=sleep.target
++ConditionPathExists=/boot/grub/grub.cfg
+ 
+ [Service]
+ Type=oneshot
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
 index 49e6272..47daf51 100644
 --- a/util/grub.d/10_linux.in
diff --git a/debian/rules b/debian/rules
index e8eb8c6..b604284 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
 
+export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
+
 HOST_CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 # -O3 (default on Ubuntu ppc64el) introduces various -Werror failures, and
 # isn't worth it here.