DLPX-84430 Boot fails with grub error: "Free Magic is Broken at..."

INSTALL

@@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If
 you don't have any of them, please obtain and install them before
 configuring the GRUB.
 
-* GCC 4.1.3 or later
-  Note: older versions may work but support is limited
-
-  Experimental support for clang 3.3 or later (results in much bigger binaries)
+* GCC 5.1.0 or later
+  Experimental support for clang 3.8.0 or later (results in much bigger binaries)
   for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64
-  Note: clang 3.2 or later works for i386 and x86_64 targets but results in
-        much bigger binaries.
-	earlier versions not tested
-  Note: clang 3.2 or later works for arm
-	earlier versions not tested
-  Note: clang on arm64 is not supported due to
-	https://llvm.org/bugs/show_bug.cgi?id=26030
-  Note: clang 3.3 or later works for mips(el)
-	earlier versions fail to generate .reginfo and hence gprel relocations
-	fail.
-  Note: clang 3.2 or later works for powerpc
-	earlier versions not tested
-  Note: clang 3.5 or later works for sparc64
-        earlier versions return "error: unable to interface with target machine"
-  Note: clang has no support for ia64 and hence you can't compile GRUB
-	for ia64 with clang
 * GNU Make
 * GNU Bison 2.3 or later
 * GNU gettext 0.17 or later

Makefile.am

@@ -473,6 +473,9 @@ ChangeLog: FORCE
 		touch $@; \
 	fi
 
+systemdsystemunit_DATA = \
+	grub-initrd-fallback.service
+
 EXTRA_DIST += ChangeLog ChangeLog-2015
 
 syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg

Makefile.in

@@ -116,7 +116,7 @@ noinst_PROGRAMS =
 platform_PROGRAMS =
 TESTS = example_unit_test$(EXEEXT) printf_test$(EXEEXT) \
 	date_test$(EXEEXT) $(am__EXEEXT_5) cmp_test$(EXEEXT) \
-	ext234_test squashfs_test iso9660_test hfsplus_test ntfs_test \
+	ext234_test iso9660_test hfsplus_test ntfs_test \
 	reiserfs_test fat_test minixfs_test xfs_test f2fs_test \
 	nilfs2_test romfs_test exfat_test tar_test udf_test hfs_test \
 	jfs_test btrfs_test zfs_test cpio_test example_scripted_test \
@@ -2640,7 +2640,7 @@ pkgdata_DATA = $(am__append_93) grub-mkconfig_lib
 bin_SCRIPTS = grub-kbdcomp
 sbin_SCRIPTS = grub-mkconfig grub-set-default grub-reboot
 platform_DATA = 
-check_SCRIPTS = ext234_test squashfs_test iso9660_test hfsplus_test \
+check_SCRIPTS = ext234_test iso9660_test hfsplus_test \
 	ntfs_test reiserfs_test fat_test minixfs_test xfs_test \
 	f2fs_test nilfs2_test romfs_test exfat_test tar_test udf_test \
 	hfs_test jfs_test btrfs_test zfs_test cpio_test \
@@ -2872,7 +2872,7 @@ CLEANFILES = $(nodist_libgrubkern_a_SOURCES) \
 	$(am__append_89) grub-mkconfig $(am__append_90) \
 	grub-set-default $(am__append_91) grub-reboot \
 	grub-mkconfig_lib $(am__append_92) grub-kbdcomp grub-shell \
-	grub-shell-tester grub-fs-tester ext234_test squashfs_test \
+	grub-shell-tester grub-fs-tester ext234_test \
 	iso9660_test hfsplus_test ntfs_test reiserfs_test fat_test \
 	minixfs_test xfs_test f2fs_test nilfs2_test romfs_test \
 	exfat_test tar_test udf_test hfs_test jfs_test btrfs_test \

Makefile.util.am

@@ -832,16 +832,6 @@ ext234_test: $(top_builddir)/config.status tests/ext234_test.in
 CLEANFILES += ext234_test
 EXTRA_DIST += 
 dist_noinst_DATA += tests/ext234_test.in 
-check_SCRIPTS += squashfs_test
-TESTS += squashfs_test
-
-squashfs_test: $(top_builddir)/config.status tests/squashfs_test.in 
-	(for x in tests/squashfs_test.in ; do cat $(srcdir)/"$$x"; done) | $(top_builddir)/config.status --file=$@:-
-	chmod a+x squashfs_test
-
-CLEANFILES += squashfs_test
-EXTRA_DIST += 
-dist_noinst_DATA += tests/squashfs_test.in 
 check_SCRIPTS += iso9660_test
 TESTS += iso9660_test
 

Makefile.util.def

@@ -779,12 +779,6 @@ script = {
   common = tests/ext234_test.in;
 };
 
-script = {
-  testcase;
-  name = squashfs_test;
-  common = tests/squashfs_test.in;
-};
-
 script = {
   testcase;
   name = iso9660_test;

configure.ac

@@ -305,6 +305,16 @@ AC_SUBST(grubdirname)
 AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
     [Default grub directory name])
 
+##### systemd unit files
+AC_ARG_WITH([systemdsystemunitdir],
+            AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+            [],
+            [with_systemdsystemunitdir=/usr/lib/systemd/system],
+            [with_systemdsystemunitdir=no])
+if test "x$with_systemdsystemunitdir" != xno; then
+   AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+
 #
 # Checks for build programs.
 #
@@ -410,7 +420,7 @@ else
 fi
 
 # Check for functions and headers.
-AC_CHECK_FUNCS(posix_memalign memalign getextmntent)
+AC_CHECK_FUNCS(posix_memalign memalign getextmntent on_exit)
 AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h)
 
 # glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits deprecation

debian/README.source

@@ -39,3 +39,6 @@ grub-team/grub uses git-dpm and contains the following branches:
 - pristine-tar:
 
   pritine-tar metadata based on upstream (not upstream).
+
+Ubuntu unapplies git-dpm patches, and instead uses gbp pq
+import|export --no-patch-numbers.

debian/build-efi-images

@@ -129,6 +129,7 @@ CD_MODULES="
 	search_fs_file
 	search_label
 	sleep
+	smbios
 	squash4
 	test
 	true
@@ -189,6 +190,7 @@ GRUB_MODULES="$CD_MODULES
 	raid6rec
 	"
 NET_MODULES="$CD_MODULES
+	http
 	tftp
 	"
 
@@ -212,9 +214,12 @@ NET_MODULES="$CD_MODULES
 # Special network boot image for d-i to use. Just the same as the
 # normal network boot image, but with a different value baked in for
 # the prefix setting
-"$grub_mkimage" -O "$platform" -o "$outdir/grubnet$efi_name-installer.efi" \
-	-d "$grub_core" -c "$workdir/grub-bootstrap.cfg" \
-	-m "$workdir/memdisk-netboot.fat" \
-	-p "${efi_vendor}-installer/$deb_arch/grub" $NET_MODULES
+#
+# but not on Ubuntu LP: #1863994
+#
+#"$grub_mkimage" -O "$platform" -o "$outdir/grubnet$efi_name-installer.efi" \
+#	-d "$grub_core" -c "$workdir/grub-bootstrap.cfg" \
+#	-m "$workdir/memdisk-netboot.fat" \
+#	-p "${efi_vendor}-installer/$deb_arch/grub" $NET_MODULES
 
 exit 0

debian/canonical-uefi-ca.crt

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENDCCAxygAwIBAgIJALlBJKAYLJJnMA0GCSqGSIb3DQEBCwUAMIGEMQswCQYD
+VQQGEwJHQjEUMBIGA1UECAwLSXNsZSBvZiBNYW4xEDAOBgNVBAcMB0RvdWdsYXMx
+FzAVBgNVBAoMDkNhbm9uaWNhbCBMdGQuMTQwMgYDVQQDDCtDYW5vbmljYWwgTHRk
+LiBNYXN0ZXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEyMDQxMjExMTI1MVoX
+DTQyMDQxMTExMTI1MVowgYQxCzAJBgNVBAYTAkdCMRQwEgYDVQQIDAtJc2xlIG9m
+IE1hbjEQMA4GA1UEBwwHRG91Z2xhczEXMBUGA1UECgwOQ2Fub25pY2FsIEx0ZC4x
+NDAyBgNVBAMMK0Nhbm9uaWNhbCBMdGQuIE1hc3RlciBDZXJ0aWZpY2F0ZSBBdXRo
+b3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/WzoWdO4hXa5h
+7Z1WrL3e3nLz3X4tTGIPrMBtSAgRz42L+2EfJ8wRbtlVPTlU60A7sbvihTR5yvd7
+v7p6yBAtGX2tWc+m1OlOD9quUupMnpDOxpkNTmdleF350dU4Skp6j5OcfxqjhdvO
++ov3wqIhLZtUQTUQVxONbLwpBlBKfuqZqWinO8cHGzKeoBmHDnm7aJktfpNS5fbr
+yZv5K+24aEm82ZVQQFvFsnGq61xX3nH5QArdW6wehC1QGlLW4fNrbpBkT1u06yDk
+YRDaWvDq5ELXAcT+IR/ZucBUlUKBUnIfSWR6yGwk8QhwC02loDLRoBxXqE3jr6WO
+BQU+EEOhAgMBAAGjgaYwgaMwHQYDVR0OBBYEFK2RmQvCKrH1FwSMI7ZlWiaONFpj
+MB8GA1UdIwQYMBaAFK2RmQvCKrH1FwSMI7ZlWiaONFpjMA8GA1UdEwEB/wQFMAMB
+Af8wCwYDVR0PBAQDAgGGMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly93d3cuY2Fu
+b25pY2FsLmNvbS9zZWN1cmUtYm9vdC1tYXN0ZXItY2EuY3JsMA0GCSqGSIb3DQEB
+CwUAA4IBAQA/ffZ2pbODtCt60G1SGgODxBKnUJxHkszAlHeC0q5Xs5kE9TI6xlUd
+B9sSqVb62NR2IOvkw1Hbmlyckj8Yc9qUaqGZOIykiG3B/Dlx0HR2FgM+ViM11VVH
+WxodQcLTEkzc/64KkpxiChcBnHPgXrH9vNa1GRF6fs0+A35m21uoyTlIUf9T4Zwx
+U5EbOxB1Axe65oECgJRwTEa3lLA9Fc0fjgLgaAKP+/lHHX2iAcYHUcSazO3dz6Nd
+7ZK7vtH95uwfM1FzBL48crB9CPgB/5h9y5zgaTl3JUdxiLGNJ6UuqPc/X4Bplz6p
+9JkU284DDgtmxBxtvbgnd8FClL38agq8
+-----END CERTIFICATE-----