Merge lp:~tom-leiming/debian-installer/trusty-for-generating-netboot-tarball-v1 into lp:~ubuntu-core-dev/debian-installer/trusty-proposed

[Ming Lei]

For generating grub.efi and netboot.tar.gz on arm64/trusty

=== added directory 'build/boot/arm64'
=== added directory 'build/boot/arm64/grub'
=== added file 'build/boot/arm64/grub/grub-efi.cfg'
--- build/boot/arm64/grub/grub-efi.cfg	1970-01-01 00:00:00 +0000
+++ build/boot/arm64/grub/grub-efi.cfg	2016-05-11 02:19:32 +0000
@@ -0,0 +1,7 @@
+set menu_color_normal=cyan/blue
+set menu_color_highlight=white/blue
+menuentry 'Install' {
+    set background_color=black
+    linux    /ubuntu-installer/arm64/linux --- quiet
+    initrd   /ubuntu-installer/arm64/initrd.gz
+}

=== modified file 'build/config/arm64/generic/netboot.cfg'
--- build/config/arm64/generic/netboot.cfg	2015-06-02 20:49:49 +0000
+++ build/config/arm64/generic/netboot.cfg	2016-05-11 02:19:32 +0000
@@ -1,11 +1,19 @@
 MEDIA_TYPE = netboot image
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) all-generic
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) all-generic
 EXTRANAME = $(MEDIUM)/
 INITRD_FS = initramfs
 
 MANIFEST-INITRD = "netboot initrd"
 MANIFEST-KERNEL = "kernel image to netboot"
 
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
+GRUB_EFI=y
+GRUB_PLATFORM=arm64-efi
+GRUB_EFI_NAME=aa64
+GRUB_FONT = /usr/share/grub/ascii.pf2
+
 generic:
 	mkdir -p $(SOME_DEST)/$(EXTRANAME)/
 	cp $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/vmlinuz
@@ -37,4 +45,26 @@
 	update-manifest $(INSTALL_PATH)/uInitrd "initrd for X-Gene Boards"
 	update-manifest $(INSTALL_PATH)/apm-mustang.dtb "Device Tree file for APM X-Gene Mustang Board"
 
-all-generic: generic xgene
+arm64_grub_efi:
+ifeq ($(GRUB_EFI),y)
+	efi-image $(TEMP_GRUB_EFI) arm64-efi aa64 $(NETBOOT_PATH)
+endif
+
+arch_netboot_dir: arm64_grub_efi
+	-rm -f $(TEMP_NETBOOT_DIR)
+	mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+	cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
+	cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/initrd.gz
+
+	if [ "$(GRUB_EFI)" = y ]; then \
+		set -e; \
+		mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi; \
+		cp -a $(TEMP_GRUB_EFI)/bootnetaa64.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
+		cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
+		cp -a $(TEMP_GRUB_EFI)/boot/grub/arm64-efi/* \
+			$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi/; \
+		cp -f boot/arm64/grub/grub-efi.cfg \
+			$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
+	fi
+
+all-generic: generic xgene arch_netboot_dir

=== modified file 'build/util/efi-image'
--- build/util/efi-image	2012-10-15 20:03:40 +0000
+++ build/util/efi-image	2016-05-11 02:19:32 +0000
@@ -22,13 +22,14 @@
 # it exists.
 
 if [ -z "$1" ] || [ -z "$2" ]; then
-	echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM EFI-NAME"
+	echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM EFI-NAME [NETBOOT-PREFIX]"
 	exit 1
 fi
 
 outdir="$1"
 platform="$2"
 efi_name="$3"
+netboot_prefix="$4"
 
 memdisk_img=
 workdir=
@@ -144,6 +145,11 @@
 		search iso9660 configfile normal memdisk tar part_msdos fat
 fi
 
+[ -z "$netboot_prefix" ] || \
+grub-mkimage -O "$platform" \
+	-o "$outdir/bootnet$efi_name.efi" -p "$netboot_prefix/grub" \
+	search configfile normal efinet tftp net
+
 # Stuff it into a FAT filesystem, making it as small as possible.  24KiB
 # headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32.
 size=$(( $(stat -c %s "$workdir/boot$efi_name.efi") / 1024 ))

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-02 17:29:58 +0000
+++ debian/changelog	2016-05-11 02:19:32 +0000
@@ -1,3 +1,9 @@
+debian-installer (20101020ubuntu318.39) trusty; urgency=medium
+
+  * generate grub.efi and netboot.tar.gz for trusty on ARM64 
+
+ -- Ming Lei <[e-mail]>  Wed, 11 May 2016 09:44:07 +0800
+
 debian-installer (20101020ubuntu318.38) trusty; urgency=medium
 
   * Enable lts-xenial builds (LP: #1568918)

=== modified file 'debian/control'
--- debian/control	2014-02-10 19:47:21 +0000
+++ debian/control	2016-05-11 02:19:32 +0000
@@ -9,7 +9,7 @@
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu
 Build-Conflicts: libnewt-pic [mipsel]
 # NOTE: Do not edit the next line by hand. See comment below.
-Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 2:4.02) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], module-init-tools [i386 arm64 armeb armel armhf amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64el s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-common [amd64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
+Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 2:4.02) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], module-init-tools [i386 arm64 armeb armel armhf amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64el s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64], grub-common [amd64 arm64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
 # This package has the worst Build-Depends in Debian, so it deserves some
 # explanation. Note that this comment can also be used to generate a
 # Build-Depends line, by running the debian/genbuilddeps program.
@@ -82,7 +82,7 @@
 #		default.)
 #	- hfsutils [powerpc]
 #		For making bootable HFS USB sticks for powerpc.
-#	- dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf]
+#	- dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64]
 #		For creating FAT filesystems with mkfs.msdos.
 #		Of course i386/amd64 use this for floppies, CDs etc.
 #		ia64 uses it for floppies (?)
@@ -148,7 +148,7 @@
 #	- tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
 #		For todos, used on files that need to be accessible from
 #		DOS.
-#	- mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf]
+#	- mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf]
 #		mcopy is used to put files onto FAT filesystems w/o
 #		mounting them.
 #	- po4a [i386 amd64]
@@ -174,9 +174,9 @@
 #		Used as the CD-ROM's bootloader
 #       - xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el]
 #               Used by grub-pc/grub-ieee1275-bin to create the CD-ROM images
-#	- grub-efi-amd64-bin (>= 2.00) [amd64]
+#       - grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64]
 #		EFI bootloader support.
-#	- grub-common [amd64]
+#	- grub-common [amd64 arm64]
 #		For the GRUB font.
 #	- debian-ports-archive-keyring [sh4 sparc64]
 #		Used for architectures hosted on debian-ports.org