Merge lp:~vorlon/debian-installer/ppc64el-netboot into lp:~ubuntu-core-dev/debian-installer/ubuntu

[Steve Langasek]

Build a grub image + netdir on ppc64el for netboot, so that users don't have
to piece this together for themselves.

[Colin Watson (cjwatson)]

LGTM now.

review: Approve

[lp:~vorlon/debian-installer/ppc64el-netboot]

1965. By Colin Watson on 2014-04-09

merge lp:~vorlon/debian-installer/ppc64el-netboot

=== modified file 'build/config/ppc64el.cfg'
--- build/config/ppc64el.cfg	2014-04-05 07:54:53 +0000
+++ build/config/ppc64el.cfg	2014-04-09 15:55:20 +0000
@@ -10,6 +10,8 @@
 KERNELIMAGEVERSION = $(KERNELVERSION)
 
 GRUB_CFG_CDROM = boot/ppc64el/grub-cdrom.cfg
+GRUB_CFG_NETBOOT=boot/ppc64el/grub-cdrom.cfg
+
 GRUB_MODULES = linux normal
 GRUB_MODULES_CDROM = iso9660
 
@@ -53,3 +55,22 @@
 		$(GRUB_MODULES) $(GRUB_MODULES_CDROM)
 	cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
 		$(TEMP_CD_INFO_DIR)/ppc/
+
+# Netboot files
+.PHONY: arch_netboot_dir
+arch_netboot_dir:
+	-rm -f $(TEMP_NETBOOT_DIR)
+	mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+	cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+	cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+	
+	bootvars-subst \
+		KERNEL $(NETBOOT_PATH)/vmlinux \
+		INITRD $(NETBOOT_PATH)/initrd.gz \
+	< $(GRUB_CFG_NETBOOT) > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg
+	if [ -n "$(SPLASH_PNG)" ]; then \
+		cp $(SPLASH_PNG) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/splash.png; \
+	fi
+
+	grub-mknetdir --net-directory=$(TEMP_NETBOOT_DIR) \
+		--subdir=$(NETBOOT_PATH)

=== modified file 'build/config/ppc64el/netboot.cfg'
--- build/config/ppc64el/netboot.cfg	2014-01-29 19:11:09 +0000
+++ build/config/ppc64el/netboot.cfg	2014-04-09 15:55:20 +0000
@@ -1,8 +1,9 @@
 MEDIA_TYPE = netboot image
 
-TARGET = $(INITRD) $(KERNEL) $(MINIISO)
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
 EXTRANAME = $(MEDIUM)/
 
-MANIFEST-INITRD = "initrd for Little-Endian 64-bit POWER CPUs (POWER8 and later)"
-MANIFEST-KERNEL = "kernel for Little-Endian 64-bit POWER CPUs (POWER8 and later)"
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
 MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-05 07:54:53 +0000
+++ debian/changelog	2014-04-09 15:55:20 +0000
@@ -1,3 +1,9 @@
+debian-installer (20101020ubuntu314) UNRELEASED; urgency=medium
+
+  * Generate a grub netboot image and grub netboot directory for ppc64el.
+
+ -- Steve Langasek <[e-mail]>  Wed, 09 Apr 2014 00:32:19 -0700
+
 debian-installer (20101020ubuntu313) trusty; urgency=medium
 
   * Move master kernels to 3.13.0-23.