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

[Dimitri John Ledkov]

this is sick, and not in a nice way.

Unmerged commits

a031a29... by Dimitri John Ledkov on 2021-02-23

one-grub v3

diff --git a/debian/changelog b/debian/changelog
index fca9ce3..29a57f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+grub2 (2.04-1ubuntu42) UNRELEASED; urgency=medium
+
+  * Use raw-signing tarball. Previously raw-uefi which is less
+    convenient. LP: #1915536
+  * Make building of singed -bin & -dbg packages be conditional on the
+    source package name. LP: #1915536
+  * Relax dependencies to allow signed -bin & -dbg be built by
+    src:grub2-unsigned (potentially of a higher version number) LP: #1915536
+  * Add debian/rules generate-grub2-unsigned target to quickly build
+    src:grub2-unsigned. LP: #1915536
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 18 Feb 2021 00:50:30 +0000
+
+grub2 (2.04-1ubuntu41) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Feb 2021 10:33:38 +0100
+
 grub2 (2.04-1ubuntu40) hirsute; urgency=medium
 
   * Revert: rhboot-f34-tcp-add-window-scaling-support.patch,
diff --git a/debian/control b/debian/control
index 9aafb52..e336773 100644
--- a/debian/control
+++ b/debian/control
@@ -313,7 +313,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 signing template)
 
 Package: grub-efi-amd64-bin
 Architecture: i386 kopensolaris-i386 any-amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (<= ${binary:Version})
 Recommends: grub-efi-amd64-signed, efibootmgr [linux-any]
 Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64 (<< 1.99-1)
 Multi-Arch: foreign
@@ -338,7 +338,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-AMD64 modules)
 Package: grub-efi-amd64-dbg
 Section: debug
 Architecture: i386 kopensolaris-i386 any-amd64
-Depends: ${misc:Depends}, grub-efi-amd64-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+Depends: ${misc:Depends}, grub-efi-amd64-bin (= ${binary:Version})
 Multi-Arch: foreign
 Description: GRand Unified Bootloader, version 2 (EFI-AMD64 debug files)
  This package contains debugging files for grub-efi-amd64-bin.  You only
@@ -347,7 +347,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-AMD64 debug files)
 Package: grub-efi-amd64
 Architecture: i386 kopensolaris-i386 any-amd64
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-amd64-bin (= ${binary:Version}), ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-amd64-bin (>= ${binary:Version}), ucf
 Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275
 Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo
 Multi-Arch: foreign
@@ -474,7 +474,7 @@ Description: GRand Unified Bootloader, version 2 (ARM UEFI version)
 
 Package: grub-efi-arm64-bin
 Architecture: any-arm64
-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (<= ${binary:Version})
 Recommends: grub-efi-arm64-signed, efibootmgr [linux-any]
 Multi-Arch: foreign
 XB-Efi-Vendor: ${efi:Vendor}
@@ -497,7 +497,7 @@ Description: GRand Unified Bootloader, version 2 (ARM64 UEFI modules)
 Package: grub-efi-arm64-dbg
 Section: debug
 Architecture: any-arm64
-Depends: ${misc:Depends}, grub-efi-arm64-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+Depends: ${misc:Depends}, grub-efi-arm64-bin (= ${binary:Version})
 Multi-Arch: foreign
 Description: GRand Unified Bootloader, version 2 (ARM64 UEFI debug files)
  This package contains debugging files for grub-efi-arm64-bin.  You only
@@ -506,7 +506,7 @@ Description: GRand Unified Bootloader, version 2 (ARM64 UEFI debug files)
 Package: grub-efi-arm64
 Architecture: any-arm64
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (= ${binary:Version}), ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (>= ${binary:Version}), ucf
 Multi-Arch: foreign
 Description: GRand Unified Bootloader, version 2 (ARM64 UEFI version)
  GRUB is a portable, powerful bootloader.  This version of GRUB is based on a
diff --git a/debian/rules b/debian/rules
index 6ccb2dc..db83e4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,8 @@ HOST_CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 HOST_CFLAGS := -Wall -Wno-error=unused-result $(shell dpkg-buildflags --get CFLAGS | perl -pe 's/-O3\b/-O2/')
 HOST_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+include /usr/share/dpkg/pkg-info.mk
+
 # to get new minilzo, with CVE fixes, patched to build with our compiler
 BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W liblzo2-dev)
 
@@ -120,12 +122,45 @@ debian/stamps/build-grub-efi-amd64 install/grub-efi-amd64: export SB_EFI_NAME :=
 debian/stamps/build-grub-efi-arm64 install/grub-efi-arm64: export SB_PLATFORM := arm64-efi
 debian/stamps/build-grub-efi-arm64 install/grub-efi-arm64: export SB_EFI_NAME := aa64
 SB_PACKAGE :=
+ONLY_BUILD :=
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+generate-grub2-unsigned:
+	sed '1s/^grub2 /grub2-unsigned /' -i debian/changelog
+	sed '1s/ grub2$$/ grub2-unsigned/' -i debian/control
+	cp ../grub2_$(DEB_VERSION_UPSTREAM).orig.tar.xz ../grub2-unsigned_$(DEB_VERSION_UPSTREAM).orig.tar.xz
+	debuild -d -S -nc -sa -us -uc
+	sed '1s/^grub2-unsigned /grub2 /' -i debian/changelog
+	sed '1s/ grub2-unsigned$$/ grub2/' -i debian/control
+
+# Submit this build of grub for raw-uefi signing?
+ifeq ($(DEB_SOURCE),grub2)
+SB_SUBMIT :=
+else
+SB_SUBMIT := yes
+endif
 ifeq ($(DEB_HOST_ARCH),amd64)
 SB_PACKAGE := grub-efi-amd64
+ifeq ($(SB_SUBMIT),)
+# on amd64, src:grub2 does not build -bin & -dbg for efi-amd64
+ONLY_BUILD := -Ngrub-efi-$(DEB_HOST_ARCH)-bin -Ngrub-efi-$(DEB_HOST_ARCH)-dbg
+else
+# on amd64, src:grub2-unsigned builds -bin & -dbg for efi-amd64
+ONLY_BUILD := -pgrub-efi-$(DEB_HOST_ARCH)-bin -pgrub-efi-$(DEB_HOST_ARCH)-dbg
 endif
-ifeq ($(DEB_HOST_ARCH),arm64)
+else ifeq ($(DEB_HOST_ARCH),arm64)
 SB_PACKAGE := grub-efi-arm64
+ifeq ($(SB_SUBMIT),)
+# on arm64, src:grub2 does not build -bin & -dbg for efi-arm64
+ONLY_BUILD := -Ngrub-efi-$(DEB_HOST_ARCH)-bin -Ngrub-efi-$(DEB_HOST_ARCH)-dbg
+else
+# on amd64, src:grub2-unsigned builds -bin & -dbg for efi-arm64
+ONLY_BUILD := -pgrub-efi-$(DEB_HOST_ARCH)-bin -pgrub-efi-$(DEB_HOST_ARCH)-dbg
+endif
+else
+ifneq ($(SB_SUBMIT),)
+# on all other arches src:grub2-unsigned FTBFS
+ONLY_BUILD := -pnone
+endif
 endif
 endif
 
@@ -577,23 +612,31 @@ LEGACY_DOC_BR := grub-doc (<< 0.97-32), grub-legacy-doc (<< 0.97-59)
 endif
 
 override_dh_gencontrol:
-	dh_gencontrol -- -Vlegacy-doc-br="$(LEGACY_DOC_BR)" -V"efi:Vendor=$(SB_EFI_VENDOR)" -VBuilt-Using="$(BUILT_USING)" $(substvars)
+	dh_gencontrol $(ONLY_BUILD) -- -Vlegacy-doc-br="$(LEGACY_DOC_BR)" -V"efi:Vendor=$(SB_EFI_VENDOR)" -VBuilt-Using="$(BUILT_USING)" $(substvars)
 
 TARNAME := grub2_$(deb_version)_$(DEB_HOST_ARCH).tar.gz
 
 override_dh_builddeb:
-	dh_builddeb
+	dh_builddeb $(ONLY_BUILD)
 ifneq (,$(SB_PACKAGE))
 	echo $(deb_version) > obj/monolithic/$(SB_PACKAGE)/version
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	if [ -d obj/monolithic/$(SB_PACKAGE)/$(deb_version) ]; then \
 		rm -rf obj/monolithic/$(SB_PACKAGE)/$(deb_version); \
 	fi
-	mkdir -v obj/monolithic/$(SB_PACKAGE)/$(deb_version)
-	ln -v obj/monolithic/$(SB_PACKAGE)/* obj/monolithic/$(SB_PACKAGE)/$(deb_version) || :
+	mkdir -vp obj/monolithic/$(SB_PACKAGE)/$(deb_version)/control
+	echo 'tarball' > obj/monolithic/$(SB_PACKAGE)/$(deb_version)/control/options
+	mkdir -p obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)-signed
+	# move version
+	cp obj/monolithic/$(SB_PACKAGE)/version obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)-signed
+	# move .efi apps where they are expected as signed
+	mv obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)/monolithic/* obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)-signed
+	# this way signed tarball more-or-less will look like how everything needs to be in /usr/lib/grub/
 endif
 	tar -c -f ../$(TARNAME) -a -C obj/monolithic/$(SB_PACKAGE) -v $(deb_version)
-	dpkg-distaddfile $(TARNAME) raw-uefi -
+ifneq (,$(SB_SUBMIT))
+	dpkg-distaddfile $(TARNAME) raw-signing -
+endif
 endif
 
 override_dh_auto_clean: