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

Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: Dimitri John Ledkov
Proposed branch: ~xnox/grub:ubuntu
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 177 lines (+73/-10)
7 files modified
debian/changelog (+16/-0)
debian/grub-common.service (+4/-3)
debian/patches/0239-arm-linux-Fix-ARM-Linux-header-layout.patch (+29/-0)
debian/patches/series (+1/-0)
debian/patches/ubuntu-add-initrd-less-boot-fallback.patch (+6/-5)
debian/patches/ubuntu-add-initrd-less-boot-messages.patch (+15/-2)
debian/rules (+2/-0)
Reviewer Review Type Date Requested Status
Julian Andres Klode Pending
Ubuntu Core Development Team Pending
Review via email: mp+405806@code.launchpad.net

Commit message

Fixes

To post a comment you must log in.
~xnox/grub:ubuntu updated
dc57667... by Dimitri John Ledkov

releasing package grub2 version 2.04-1ubuntu46

Unmerged commits

dc57667... by Dimitri John Ledkov

releasing package grub2 version 2.04-1ubuntu46

cac893c... by Dimitri John Ledkov

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

debian/rules: disable LTO. LP: #1922005

484afe3... by Dimitri John Ledkov

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

f1a3e2b... by Dimitri John Ledkov

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

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

releasing package grub2 version 2.04-1ubuntu45

22f99c4... by Dimitri John Ledkov

Drop redundant dh-systemd build-dependency.

3945b11... by Dimitri John Ledkov

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

Import uploads upto 2.04-1ubuntu44

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index ab465cf..d69daca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
1grub2 (2.04-1ubuntu46) impish; urgency=medium
2
3 * debian/grub-common.service: change type to oneshot, add wantedby
4 sleep.target, after sleep.target. The service will now start after
5 resume from hybernation. LP: #1929860
6 * grub-initrd-fallback.service: add wantedby sleep.target, after
7 sleep.target. The service will now start after resume from
8 hybernation. LP: #1929860
9 * cherrypick upstream fix to make armhf efi boot work. LP: #1788940
10 * debian/rules: disable LTO. LP: #1922005
11 * grub-initrd-fallback.service, debian/grub-common.service: only start
12 units when booted with grub. Use presence of /boot/grub/grub.cfg as
13 proxy. LP: #1925507
14
15 -- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Fri, 16 Jul 2021 12:02:33 +0100
16
1grub2 (2.04-1ubuntu45) hirsute; urgency=medium17grub2 (2.04-1ubuntu45) hirsute; urgency=medium
218
3 * Unapply all patches.19 * 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 @@
1[Unit]1[Unit]
2Description=Record successful boot for GRUB2Description=Record successful boot for GRUB
3After=sleep.target
4ConditionPathExists=/boot/grub/grub.cfg
35
4[Service]6[Service]
5Type=simple7Type=oneshot
6Restart=no8Restart=no
7RemainAfterExit=yes
8ExecStartPre=/bin/sh -c '[ -s /boot/grub/grubenv ] || rm -f /boot/grub/grubenv; mkdir -p /boot/grub'9ExecStartPre=/bin/sh -c '[ -s /boot/grub/grubenv ] || rm -f /boot/grub/grubenv; mkdir -p /boot/grub'
9ExecStart=grub-editenv /boot/grub/grubenv unset recordfail10ExecStart=grub-editenv /boot/grub/grubenv unset recordfail
10ExecStartPost=/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'11ExecStartPost=/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'
11StandardOutput=kmsg12StandardOutput=kmsg
1213
13[Install]14[Install]
14WantedBy=multi-user.target15WantedBy=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
15new file mode 10064416new file mode 100644
index 0000000..5de0f28
--- /dev/null
+++ b/debian/patches/0239-arm-linux-Fix-ARM-Linux-header-layout.patch
@@ -0,0 +1,29 @@
1From: Ard Biesheuvel <ard.biesheuvel@arm.com>
2Date: Sun, 25 Oct 2020 14:49:34 +0100
3Subject: arm/linux: Fix ARM Linux header layout
4
5The hdr_offset member of the ARM Linux image header appears at
6offset 0x3c, matching the PE/COFF spec's placement of the COFF
7header offset in the MS-DOS header. We're currently off by four,
8so fix that.
9
10Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
11Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
12(cherry picked from commit a166484483a94f6a414c09a1e449d51fb1beaf05)
13---
14 include/grub/arm/linux.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
18index 2e98a66..bcd5a7e 100644
19--- a/include/grub/arm/linux.h
20+++ b/include/grub/arm/linux.h
21@@ -30,7 +30,7 @@ struct linux_arm_kernel_header {
22 grub_uint32_t magic;
23 grub_uint32_t start; /* _start */
24 grub_uint32_t end; /* _edata */
25- grub_uint32_t reserved2[4];
26+ grub_uint32_t reserved2[3];
27 grub_uint32_t hdr_offset;
28 };
29
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
2360236-gdb-Restrict-GDB-access-when-locked-down.patch2360236-gdb-Restrict-GDB-access-when-locked-down.patch
2370237-loader-xnu-Don-t-allow-loading-extension-and-package.patch2370237-loader-xnu-Don-t-allow-loading-extension-and-package.patch
2380238-util-grub-install-Fix-NULL-pointer-dereferences.patch2380238-util-grub-install-Fix-NULL-pointer-dereferences.patch
2390239-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
11---11---
12 Makefile.am | 3 ++12 Makefile.am | 3 ++
13 configure.ac | 10 +++++++13 configure.ac | 10 +++++++
14 grub-initrd-fallback.service | 13 +++++++++14 grub-initrd-fallback.service | 14 +++++++++
15 util/grub.d/00_header.in | 27 ++++++++++++++++++15 util/grub.d/00_header.in | 27 ++++++++++++++++++
16 util/grub.d/10_linux.in | 68 +++++++++++++++++++++++++++++++++-----------16 util/grub.d/10_linux.in | 68 +++++++++++++++++++++++++++++++++-----------
17 5 files changed, 105 insertions(+), 16 deletions(-)17 5 files changed, 106 insertions(+), 16 deletions(-)
18 create mode 100644 grub-initrd-fallback.service18 create mode 100644 grub-initrd-fallback.service
1919
20diff --git a/Makefile.am b/Makefile.am20diff --git a/Makefile.am b/Makefile.am
@@ -54,14 +54,15 @@ index 8832455..1819188 100644
54 #54 #
55diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service55diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
56new file mode 10064456new file mode 100644
57index 0000000..fb0b76e57index 0000000..1a0a4e5
58--- /dev/null58--- /dev/null
59+++ b/grub-initrd-fallback.service59+++ b/grub-initrd-fallback.service
60@@ -0,0 +1,13 @@60@@ -0,0 +1,14 @@
61+[Unit]61+[Unit]
62+Description=GRUB failed boot detection62+Description=GRUB failed boot detection
63+After=local-fs.target63+After=local-fs.target
64+After=grub-common.service64+After=grub-common.service
65+After=sleep.target
65+66+
66+[Service]67+[Service]
67+Type=oneshot68+Type=oneshot
@@ -70,7 +71,7 @@ index 0000000..fb0b76e
70+TimeoutSec=071+TimeoutSec=0
71+72+
72+[Install]73+[Install]
73+WantedBy=multi-user.target rescue.target emergency.target74+WantedBy=multi-user.target rescue.target emergency.target sleep.target
74diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in75diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
75index b7135b6..2642f66 10064476index b7135b6..2642f66 100644
76--- a/util/grub.d/00_header.in77--- 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.
88
9Patch-Name: ubuntu-add-initrd-less-boot-messages.patch9Patch-Name: ubuntu-add-initrd-less-boot-messages.patch
10---10---
11 util/grub.d/10_linux.in | 10 ++++++++++11 grub-initrd-fallback.service | 1 +
12 1 file changed, 10 insertions(+)12 util/grub.d/10_linux.in | 10 ++++++++++
13 2 files changed, 11 insertions(+)
1314
15diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
16index 1a0a4e5..59d1a62 100644
17--- a/grub-initrd-fallback.service
18+++ b/grub-initrd-fallback.service
19@@ -3,6 +3,7 @@ Description=GRUB failed boot detection
20 After=local-fs.target
21 After=grub-common.service
22 After=sleep.target
23+ConditionPathExists=/boot/grub/grub.cfg
24
25 [Service]
26 Type=oneshot
14diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in27diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
15index 49e6272..47daf51 10064428index 49e6272..47daf51 100644
16--- a/util/grub.d/10_linux.in29--- 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)
10DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)10DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
11DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)11DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
1212
13export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
14
13HOST_CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)15HOST_CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
14# -O3 (default on Ubuntu ppc64el) introduces various -Werror failures, and16# -O3 (default on Ubuntu ppc64el) introduces various -Werror failures, and
15# isn't worth it here.17# isn't worth it here.

Subscribers

People subscribed via source and target branches