Merge lp:~dannf/debian-installer/xgene-uboot-gzip-support into lp:~ubuntu-core-dev/debian-installer/ubuntu

[dann frazier]

=== modified file 'build/config/arm64/netboot.cfg'
--- build/config/arm64/netboot.cfg	2015-02-24 05:45:09 +0000
+++ build/config/arm64/netboot.cfg	2016-07-20 17:27:20 +0000
@@ -8,6 +8,10 @@
 MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
 MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
 
+gzipmagic = 8b1f
+magic = $(shell od -x -N2 $(1) | head -1 | cut -d' ' -f2)
+compress-type = $(if $(findstring $(gzipmagic),$(call magic,$(1))),gzip,none)
+
 .PHONY: arch_netboot_dir
 arch_netboot_dir:
 	-rm -f $(TEMP_NETBOOT_DIR)
@@ -33,5 +37,5 @@
 	# They don't currently support bootz.
 	$(eval XU_INSTALL_PATH=$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/xgene-uboot)
 	mkdir -p $(XU_INSTALL_PATH)
-	mkimage -A arm -O linux -T kernel -C none -a 0x80000 -e 0x80000 -n "Ubuntu kernel" -d $(TEMP_KERNEL) $(XU_INSTALL_PATH)/uImage
+	mkimage -A arm -O linux -T kernel -C $(call compress-type,$(TEMP_KERNEL)) -a 0x80000 -e 0x80000 -n "Ubuntu kernel" -d $(TEMP_KERNEL) $(XU_INSTALL_PATH)/uImage
 	mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(XU_INSTALL_PATH)/uInitrd
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-07-19 16:53:19 +0000
+++ debian/changelog	2016-07-20 17:27:20 +0000
@@ -1,3 +1,10 @@
+debian-installer (20101020ubuntu467) UNRELEASED; urgency=medium
+
+  * arm64/xgene-uboot: Set the correct compression flag when generating
+    a uImage of a gzip'd kernel.
+
+ -- dann frazier <[e-mail]>  Wed, 20 Jul 2016 11:12:07 -0600
+
 debian-installer (20101020ubuntu466) yakkety; urgency=medium
 
   * Strop stripping modules; it removes the signatures (LP: #1604441)