grub

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

  1. Git
  2. lp:~xnox/grub
  3. one-grub-v3
  4. Merge into ubuntu
Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: Dimitri John Ledkov
Proposed branch: ~xnox/grub:one-grub-v3
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 182 lines (+74/-12)
3 files modified
debian/changelog (+19/-0)
debian/control (+6/-6)
debian/rules (+49/-6)
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+398507@code.launchpad.net

Commit message

this is sick, and not in a nice way.

To post a comment you must log in.

Unmerged commits

a031a29... by Dimitri John Ledkov

one-grub v3

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 fca9ce3..29a57f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
1grub2 (2.04-1ubuntu42) UNRELEASED; urgency=medium
2
3 * Use raw-signing tarball. Previously raw-uefi which is less
4 convenient. LP: #1915536
5 * Make building of singed -bin & -dbg packages be conditional on the
6 source package name. LP: #1915536
7 * Relax dependencies to allow signed -bin & -dbg be built by
8 src:grub2-unsigned (potentially of a higher version number) LP: #1915536
9 * Add debian/rules generate-grub2-unsigned target to quickly build
10 src:grub2-unsigned. LP: #1915536
11
12 -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 18 Feb 2021 00:50:30 +0000
13
14grub2 (2.04-1ubuntu41) hirsute; urgency=medium
15
16 * No-change rebuild to drop the udeb package.
17
18 -- Matthias Klose <doko@ubuntu.com> Mon, 22 Feb 2021 10:33:38 +0100
19
1grub2 (2.04-1ubuntu40) hirsute; urgency=medium20grub2 (2.04-1ubuntu40) hirsute; urgency=medium
221
3 * Revert: rhboot-f34-tcp-add-window-scaling-support.patch,22 * 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)
313313
314Package: grub-efi-amd64-bin314Package: grub-efi-amd64-bin
315Architecture: i386 kopensolaris-i386 any-amd64315Architecture: i386 kopensolaris-i386 any-amd64
316Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})316Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (<= ${binary:Version})
317Recommends: grub-efi-amd64-signed, efibootmgr [linux-any]317Recommends: grub-efi-amd64-signed, efibootmgr [linux-any]
318Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64 (<< 1.99-1)318Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64 (<< 1.99-1)
319Multi-Arch: foreign319Multi-Arch: foreign
@@ -338,7 +338,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-AMD64 modules)
338Package: grub-efi-amd64-dbg338Package: grub-efi-amd64-dbg
339Section: debug339Section: debug
340Architecture: i386 kopensolaris-i386 any-amd64340Architecture: i386 kopensolaris-i386 any-amd64
341Depends: ${misc:Depends}, grub-efi-amd64-bin (= ${binary:Version}), grub-common (= ${binary:Version})341Depends: ${misc:Depends}, grub-efi-amd64-bin (= ${binary:Version})
342Multi-Arch: foreign342Multi-Arch: foreign
343Description: GRand Unified Bootloader, version 2 (EFI-AMD64 debug files)343Description: GRand Unified Bootloader, version 2 (EFI-AMD64 debug files)
344 This package contains debugging files for grub-efi-amd64-bin. You only344 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)
347Package: grub-efi-amd64347Package: grub-efi-amd64
348Architecture: i386 kopensolaris-i386 any-amd64348Architecture: i386 kopensolaris-i386 any-amd64
349Pre-Depends: ${misc:Pre-Depends}349Pre-Depends: ${misc:Pre-Depends}
350Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-amd64-bin (= ${binary:Version}), ucf350Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-amd64-bin (>= ${binary:Version}), ucf
351Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275351Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275
352Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo352Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo
353Multi-Arch: foreign353Multi-Arch: foreign
@@ -474,7 +474,7 @@ Description: GRand Unified Bootloader, version 2 (ARM UEFI version)
474474
475Package: grub-efi-arm64-bin475Package: grub-efi-arm64-bin
476Architecture: any-arm64476Architecture: any-arm64
477Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})477Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (<= ${binary:Version})
478Recommends: grub-efi-arm64-signed, efibootmgr [linux-any]478Recommends: grub-efi-arm64-signed, efibootmgr [linux-any]
479Multi-Arch: foreign479Multi-Arch: foreign
480XB-Efi-Vendor: ${efi:Vendor}480XB-Efi-Vendor: ${efi:Vendor}
@@ -497,7 +497,7 @@ Description: GRand Unified Bootloader, version 2 (ARM64 UEFI modules)
497Package: grub-efi-arm64-dbg497Package: grub-efi-arm64-dbg
498Section: debug498Section: debug
499Architecture: any-arm64499Architecture: any-arm64
500Depends: ${misc:Depends}, grub-efi-arm64-bin (= ${binary:Version}), grub-common (= ${binary:Version})500Depends: ${misc:Depends}, grub-efi-arm64-bin (= ${binary:Version})
501Multi-Arch: foreign501Multi-Arch: foreign
502Description: GRand Unified Bootloader, version 2 (ARM64 UEFI debug files)502Description: GRand Unified Bootloader, version 2 (ARM64 UEFI debug files)
503 This package contains debugging files for grub-efi-arm64-bin. You only503 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)
506Package: grub-efi-arm64506Package: grub-efi-arm64
507Architecture: any-arm64507Architecture: any-arm64
508Pre-Depends: ${misc:Pre-Depends}508Pre-Depends: ${misc:Pre-Depends}
509Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (= ${binary:Version}), ucf509Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (>= ${binary:Version}), ucf
510Multi-Arch: foreign510Multi-Arch: foreign
511Description: GRand Unified Bootloader, version 2 (ARM64 UEFI version)511Description: GRand Unified Bootloader, version 2 (ARM64 UEFI version)
512 GRUB is a portable, powerful bootloader. This version of GRUB is based on a512 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)
16HOST_CFLAGS := -Wall -Wno-error=unused-result $(shell dpkg-buildflags --get CFLAGS | perl -pe 's/-O3\b/-O2/')16HOST_CFLAGS := -Wall -Wno-error=unused-result $(shell dpkg-buildflags --get CFLAGS | perl -pe 's/-O3\b/-O2/')
17HOST_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)17HOST_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
1818
19include /usr/share/dpkg/pkg-info.mk
20
19# to get new minilzo, with CVE fixes, patched to build with our compiler21# to get new minilzo, with CVE fixes, patched to build with our compiler
20BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W liblzo2-dev)22BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W liblzo2-dev)
2123
@@ -120,12 +122,45 @@ debian/stamps/build-grub-efi-amd64 install/grub-efi-amd64: export SB_EFI_NAME :=
120debian/stamps/build-grub-efi-arm64 install/grub-efi-arm64: export SB_PLATFORM := arm64-efi122debian/stamps/build-grub-efi-arm64 install/grub-efi-arm64: export SB_PLATFORM := arm64-efi
121debian/stamps/build-grub-efi-arm64 install/grub-efi-arm64: export SB_EFI_NAME := aa64123debian/stamps/build-grub-efi-arm64 install/grub-efi-arm64: export SB_EFI_NAME := aa64
122SB_PACKAGE :=124SB_PACKAGE :=
125ONLY_BUILD :=
123ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))126ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
127generate-grub2-unsigned:
128 sed '1s/^grub2 /grub2-unsigned /' -i debian/changelog
129 sed '1s/ grub2$$/ grub2-unsigned/' -i debian/control
130 cp ../grub2_$(DEB_VERSION_UPSTREAM).orig.tar.xz ../grub2-unsigned_$(DEB_VERSION_UPSTREAM).orig.tar.xz
131 debuild -d -S -nc -sa -us -uc
132 sed '1s/^grub2-unsigned /grub2 /' -i debian/changelog
133 sed '1s/ grub2-unsigned$$/ grub2/' -i debian/control
134
135# Submit this build of grub for raw-uefi signing?
136ifeq ($(DEB_SOURCE),grub2)
137SB_SUBMIT :=
138else
139SB_SUBMIT := yes
140endif
124ifeq ($(DEB_HOST_ARCH),amd64)141ifeq ($(DEB_HOST_ARCH),amd64)
125SB_PACKAGE := grub-efi-amd64142SB_PACKAGE := grub-efi-amd64
143ifeq ($(SB_SUBMIT),)
144# on amd64, src:grub2 does not build -bin & -dbg for efi-amd64
145ONLY_BUILD := -Ngrub-efi-$(DEB_HOST_ARCH)-bin -Ngrub-efi-$(DEB_HOST_ARCH)-dbg
146else
147# on amd64, src:grub2-unsigned builds -bin & -dbg for efi-amd64
148ONLY_BUILD := -pgrub-efi-$(DEB_HOST_ARCH)-bin -pgrub-efi-$(DEB_HOST_ARCH)-dbg
126endif149endif
127ifeq ($(DEB_HOST_ARCH),arm64)150else ifeq ($(DEB_HOST_ARCH),arm64)
128SB_PACKAGE := grub-efi-arm64151SB_PACKAGE := grub-efi-arm64
152ifeq ($(SB_SUBMIT),)
153# on arm64, src:grub2 does not build -bin & -dbg for efi-arm64
154ONLY_BUILD := -Ngrub-efi-$(DEB_HOST_ARCH)-bin -Ngrub-efi-$(DEB_HOST_ARCH)-dbg
155else
156# on amd64, src:grub2-unsigned builds -bin & -dbg for efi-arm64
157ONLY_BUILD := -pgrub-efi-$(DEB_HOST_ARCH)-bin -pgrub-efi-$(DEB_HOST_ARCH)-dbg
158endif
159else
160ifneq ($(SB_SUBMIT),)
161# on all other arches src:grub2-unsigned FTBFS
162ONLY_BUILD := -pnone
163endif
129endif164endif
130endif165endif
131166
@@ -577,23 +612,31 @@ LEGACY_DOC_BR := grub-doc (<< 0.97-32), grub-legacy-doc (<< 0.97-59)
577endif612endif
578613
579override_dh_gencontrol:614override_dh_gencontrol:
580 dh_gencontrol -- -Vlegacy-doc-br="$(LEGACY_DOC_BR)" -V"efi:Vendor=$(SB_EFI_VENDOR)" -VBuilt-Using="$(BUILT_USING)" $(substvars)615 dh_gencontrol $(ONLY_BUILD) -- -Vlegacy-doc-br="$(LEGACY_DOC_BR)" -V"efi:Vendor=$(SB_EFI_VENDOR)" -VBuilt-Using="$(BUILT_USING)" $(substvars)
581616
582TARNAME := grub2_$(deb_version)_$(DEB_HOST_ARCH).tar.gz617TARNAME := grub2_$(deb_version)_$(DEB_HOST_ARCH).tar.gz
583618
584override_dh_builddeb:619override_dh_builddeb:
585 dh_builddeb620 dh_builddeb $(ONLY_BUILD)
586ifneq (,$(SB_PACKAGE))621ifneq (,$(SB_PACKAGE))
587 echo $(deb_version) > obj/monolithic/$(SB_PACKAGE)/version622 echo $(deb_version) > obj/monolithic/$(SB_PACKAGE)/version
588ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))623ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
589 if [ -d obj/monolithic/$(SB_PACKAGE)/$(deb_version) ]; then \624 if [ -d obj/monolithic/$(SB_PACKAGE)/$(deb_version) ]; then \
590 rm -rf obj/monolithic/$(SB_PACKAGE)/$(deb_version); \625 rm -rf obj/monolithic/$(SB_PACKAGE)/$(deb_version); \
591 fi626 fi
592 mkdir -v obj/monolithic/$(SB_PACKAGE)/$(deb_version)627 mkdir -vp obj/monolithic/$(SB_PACKAGE)/$(deb_version)/control
593 ln -v obj/monolithic/$(SB_PACKAGE)/* obj/monolithic/$(SB_PACKAGE)/$(deb_version) || :628 echo 'tarball' > obj/monolithic/$(SB_PACKAGE)/$(deb_version)/control/options
629 mkdir -p obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)-signed
630 # move version
631 cp obj/monolithic/$(SB_PACKAGE)/version obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)-signed
632 # move .efi apps where they are expected as signed
633 mv obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)/monolithic/* obj/monolithic/$(SB_PACKAGE)/$(deb_version)/$(SB_PLATFORM)-signed
634 # this way signed tarball more-or-less will look like how everything needs to be in /usr/lib/grub/
594endif635endif
595 tar -c -f ../$(TARNAME) -a -C obj/monolithic/$(SB_PACKAGE) -v $(deb_version)636 tar -c -f ../$(TARNAME) -a -C obj/monolithic/$(SB_PACKAGE) -v $(deb_version)
596 dpkg-distaddfile $(TARNAME) raw-uefi -637ifneq (,$(SB_SUBMIT))
638 dpkg-distaddfile $(TARNAME) raw-signing -
639endif
597endif640endif
598641
599override_dh_auto_clean:642override_dh_auto_clean:

Subscribers

People subscribed via source and target branches