Merge lp:~dannf/ubuntu/wily/grub2-signed/arm64-support into lp:ubuntu/wily/grub2-signed

[dann frazier]

[Mathieu Trudel-Lapierre (cyphermox)]

Looks appropriate; but will obviously explode unless grub2 already builds the new grub-efi-arm64 package, and so needs to wait to be merged/uploaded until after it.

It's up to you whether you want to fixup changelog now or wait until grub2 is ready as well; since it's a requirement to upload grub2-signed with grub2 anyway, we can do the changelog fixes just before merging.

review: Approve

[dann frazier (dannf)]

Sorry, can you elaborate on what you mean by "fixup changelog" - just going UNRELEASED->wily?

Also, I should note that this will also require a control file update to make the grub2 versioned build-deps match the version of grub2 that eventually gets uploaded w/ arm64 image support.

[Adam Conrad (adconrad)]

You should never use "dpkg --print-architecture" to determine the arch you're building FOR. What you're looking for (in both places) is dpkg-architecture -qDEB_HOST_ARCH

Other oddities:

1) Why do we need .install files when we didn't seem to before?
2) symlinking to arch-specific bits in clean doesn't seem clever, you'll get different source cruft depending on the arch you clean/upload on.

review: Needs Fixing

[lp:~dannf/ubuntu/wily/grub2-signed/arm64-support]

49. By dann frazier on 2015-06-15

Use 'dpkg-architecture -qDEB_HOST_ARCH' instead of dpkg --print-architecture

Correctly identifies the architecture of the host we are building for vs.
the host we happen to be building on.

50. By dann frazier on 2015-06-15

Stop doing postinst symlink generation during clean.

Just include all necessary symlinks to avoid different source package contents
when generated on different architectures.

51. By dann frazier on 2015-06-15

Override destdir during install instead of adding .install files

[dann frazier (dannf)]

> You should never use "dpkg --print-architecture" to determine the arch you're
> building FOR. What you're looking for (in both places) is dpkg-architecture
> -qDEB_HOST_ARCH

Fixed.

> Other oddities:
>
> 1) Why do we need .install files when we didn't seem to before?

It is just how I chose to handle the single-binary -> multi-binary conversion. But it does seem like a pain to have to add that file for every new architecture. I switched this to just overriding destdir during install.

> 2) symlinking to arch-specific bits in clean doesn't seem clever, you'll get
> different source cruft depending on the arch you clean/upload on.

Fixed.

review: Needs Resubmitting

[lp:~dannf/ubuntu/wily/grub2-signed/arm64-support]

52. By dann frazier on 2015-06-29

Use dpkg built-in make snippet instead of populating variables manually

53. By dann frazier on 2015-06-29

Merge lp:ubuntu/grub2-signed

54. By dann frazier on 2015-07-22

Merge lp:ubuntu/grub2-signed

55. By dann frazier on 2015-07-22

Rebuild against grub-efi-amd64 2.02~beta2-26ubuntu4.

[Adam Conrad (adconrad)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-09-12 17:14:41 +0000
+++ Makefile	2015-07-22 17:23:13 +0000
@@ -1,7 +1,22 @@
+include /usr/share/dpkg/default.mk
+
+PLATFORM := UNKNOWN-PLATFORM
+EFI_NAME := UNKNOWN-EFI-NAME
+
+ifeq ($(DEB_HOST_ARCH),amd64)
+PLATFORM := x86_64-efi
+EFI_NAME := x64
+endif
+
+ifeq ($(DEB_HOST_ARCH),arm64)
+PLATFORM := arm64-efi
+EFI_NAME := aa64
+endif
+
 SIGNED := \
-	grubx64.efi.signed \
-	gcdx64.efi.signed \
-	grubnetx64.efi.signed
+	grub$(EFI_NAME).efi.signed \
+	gcd$(EFI_NAME).efi.signed \
+	grubnet$(EFI_NAME).efi.signed
 
 all: $(SIGNED)
 
@@ -9,9 +24,9 @@
 	./download-grub2
 
 install: $(SIGNED)
-	install -d $(DESTDIR)/usr/lib/grub/x86_64-efi-signed
+	install -d $(DESTDIR)/usr/lib/grub/$(PLATFORM)-signed
 	install -m0644 $(SIGNED) version \
-		$(DESTDIR)/usr/lib/grub/x86_64-efi-signed/
+		$(DESTDIR)/usr/lib/grub/$(PLATFORM)-signed/
 
 clean:
 	rm -f $(SIGNED) version
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-07-06 18:24:53 +0000
+++ debian/changelog	2015-07-22 17:23:13 +0000
@@ -1,3 +1,10 @@
+grub2-signed (1.53) UNRELEASED; urgency=medium
+
+  * Add arm64 support. (LP: #1457178)
+  * Rebuild against grub-efi-amd64 2.02~beta2-26ubuntu4.
+
+ -- dann frazier <[e-mail]>  Wed, 22 Jul 2015 11:20:23 -0600
+
 grub2-signed (1.52) wily; urgency=medium
 
   * Rebuild against grub-efi-amd64 2.02~beta2-26ubuntu3.
 
=== modified file 'debian/control'
--- debian/control	2015-07-06 18:24:53 +0000
+++ debian/control	2015-07-22 17:23:13 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Colin Watson <[e-mail]>
-Build-Depends: debhelper (>= 9), lsb-release, python3, python3-apt, grub-efi-amd64-bin (>= 2.02~beta2-26ubuntu3)
+Build-Depends: debhelper (>= 9), lsb-release, python3, python3-apt, grub-efi-amd64-bin (>= 2.02~beta2-26ubuntu4) [amd64], grub-efi-arm64-bin (>= 2.02~beta2-26ubuntu4) [arm64]
 Standards-Version: 3.9.5
 
 Package: grub-efi-amd64-signed
@@ -22,3 +22,21 @@
  .
  This package contains a version of GRUB built for use with the EFI-AMD64
  architecture, signed with Canonical's UEFI signing key.
+
+Package: grub-efi-arm64-signed
+Architecture: arm64
+Depends: ${misc:Depends}, grub-efi-arm64 (= ${grub2:Version})
+Recommends: secureboot-db
+Built-Using: grub2 (= ${grub2:Version})
+Description: GRand Unified Bootloader, version 2 (EFI-ARM64 version, signed)
+ GRUB is a portable, powerful bootloader.  This version of GRUB is based on a
+ cleaner design than its predecessors, and provides the following new features:
+ .
+  - Scripting in grub.cfg using BASH-like syntax.
+  - Support for modern partition maps such as GPT.
+  - Modular generation of grub.cfg via update-grub.  Packages providing GRUB
+    add-ons can plug in their own script rules and trigger updates by invoking
+    update-grub.
+ .
+ This package contains a version of GRUB built for use with the EFI-ARM64
+ architecture, signed with Canonical's UEFI signing key.
 
=== added symlink 'debian/grub-efi-amd64-signed.postinst'
=== target is u'postinst.common'
=== added symlink 'debian/grub-efi-arm64-signed.postinst'
=== target is u'postinst.common'
=== renamed file 'debian/grub-efi-amd64-signed.postinst' => 'debian/postinst.common'
=== modified file 'debian/rules'
--- debian/rules	2012-09-21 23:57:13 +0000
+++ debian/rules	2015-07-22 17:23:13 +0000
@@ -1,11 +1,12 @@
 #! /usr/bin/make -f
 
-VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+include /usr/share/dpkg/default.mk
 
 %:
 	dh $@
 
-docdir := debian/grub-efi-amd64-signed/usr/share/doc/grub-efi-amd64-signed
+destdir := debian/grub-efi-$(DEB_HOST_ARCH)-signed
+docdir  := $(destdir)/usr/share/doc/grub-efi-$(DEB_HOST_ARCH)-signed
 
 override_dh_installchangelogs:
 	dh_installchangelogs
@@ -14,5 +15,8 @@
 	ln $(docdir)/changelog $(docdir)/changelog.Debian
 
 override_dh_gencontrol:
-	dh_gencontrol -- -v$(VERSION)+$(shell cat version) \
+	dh_gencontrol -- -v$(DEB_VERSION)+$(shell cat version) \
 		-Vgrub2:Version=$(shell cat version)
+
+override_dh_auto_install:
+	dh_auto_install --destdir=$(destdir)
 
=== modified file 'download-grub2'
--- download-grub2	2013-09-12 17:14:41 +0000
+++ download-grub2	2015-07-22 17:23:13 +0000
@@ -6,17 +6,24 @@
 from urllib.request import urlopen
 
 import apt
+import apt_pkg
 
+ARCH_TO_EFI_NAME = {
+    'amd64': 'x64',
+    'arm64': 'aa64',
+}
+arch = apt_pkg.config['Apt::Architecture']
+efi_name = ARCH_TO_EFI_NAME[arch]
 cache = apt.Cache()
-grub_efi_amd64 = cache["grub-efi-amd64"].candidate
-pool_parsed = urlparse(grub_efi_amd64.uri)
+grub_efi = cache["grub-efi-%s" % (arch)].candidate
+pool_parsed = urlparse(grub_efi.uri)
 dists_dir = "/dists/%s/main/uefi/grub2-%s/current/" % (
-    grub_efi_amd64.origins[0].archive, grub_efi_amd64.architecture)
+    grub_efi.origins[0].archive, grub_efi.architecture)
 
 for base in (
-        "gcdx64.efi.signed",
-        "grubx64.efi.signed",
-        "grubnetx64.efi.signed",
+        "gcd%s.efi.signed" % (efi_name),
+        "grub%s.efi.signed" % (efi_name),
+        "grubnet%s.efi.signed" % (efi_name),
         "version",
         ):
     dists_parsed = list(pool_parsed)