Merge lp:~daniel-thewatkins/livecd-rootfs/s390x_cloud_images into lp:livecd-rootfs

[Dan Watkins]

[lp:~daniel-thewatkins/livecd-rootfs/s390x_cloud_images]

1260. By Dan Watkins on 2016-01-13

Enable building of s390x cloud images.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-08 21:51:54 +0000
+++ debian/changelog	2016-01-13 10:19:24 +0000
@@ -8,6 +8,9 @@
   * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot:
     - remove libicu52 hook
 
+  [ Daniel Watkins ]
+  * Enable building of s390x cloud images.
+
  -- Łukasz 'sil2100' Zemczak <[e-mail]>  Mon, 14 Dec 2015 10:13:31 +0100
 
 livecd-rootfs (2.368) xenial; urgency=medium

=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
--- live-build/ubuntu-cpc/hooks/032-disk-image.binary	2015-11-06 09:54:59 +0000
+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary	2016-01-13 10:19:24 +0000
@@ -34,7 +34,7 @@
 
 should_install_grub() {
     case $architecture in
-        armhf|arm64)
+        armhf|arm64|s390x)
             return 1
             ;;
         *)
@@ -56,5 +56,30 @@
     rmdir mountpoint
 fi
 
+if [ "$architecture" = "s390x" ]; then
+    # Do ZIPL install bits
+    mkdir mountpoint
+    mount_partition "${rootfs_dev_mapper}" mountpoint
+
+    # Write out cloudy zipl.conf for future kernel updates
+    cat << EOF > mountpoint/etc/zipl.conf
+# This has been modified by the cloud image build process
+[defaultboot]
+default=ubuntu
+
+[ubuntu]
+target = /boot
+image = /boot/vmlinuz
+ramdisk = /boot/initrd.img
+parameters = root=LABEL=cloudimg-rootfs
+EOF
+
+    # Create bootmap file
+    mountpoint/sbin/zipl -V --image=mountpoint/boot/vmlinuz --ramdisk=mountpoint/boot/initrd.img --parameters='root=LABEL=cloudimg-rootfs' --target=mountpoint/boot/ --targetbase=/dev/loop0 --targettype=SCSI --targetblocksize=512 --targetoffset=2048
+
+    umount_partition mountpoint
+    rmdir mountpoint
+fi
+
 clean_loops
 trap - EXIT

=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2015-11-06 09:54:59 +0000
+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2016-01-13 10:19:24 +0000
@@ -142,6 +142,10 @@
    exit 0
 fi
 
+if [ "$arch" = "s390x" ]; then
+    exit 0
+fi
+
 ## Add ttyS0 for i386/amd64 for Trusty and newer
 if [ "$arch" = "i386" -o "$arch" = "amd64" ]; then
    add_serial_console ttyS0