Import patches-unapplied version 2.369 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: fafd5d2e07ba316cbce81f78f3fd5b681e7cb523

New changelog entries:
  [ Łukasz 'sil2100' Zemczak ]
  * Fix the invalid path for the error message in 00-uid-gid-fix.chroot_early
    for ubuntu-touch.
  [ Michael Vogt ]
  * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot:
    - remove libicu52 hook
  [ Daniel Watkins ]
  * Enable building of s390x cloud images.

debian/changelog

@@ -1,3 +1,18 @@
+livecd-rootfs (2.369) xenial; urgency=medium
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Fix the invalid path for the error message in 00-uid-gid-fix.chroot_early
+    for ubuntu-touch.
+
+  [ Michael Vogt ]
+  * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot:
+    - remove libicu52 hook
+
+  [ Daniel Watkins ]
+  * Enable building of s390x cloud images.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 13 Jan 2016 10:29:43 +0000
+
 livecd-rootfs (2.368) xenial; urgency=medium
 
   * Fix earlier mistake of changing the wrong hashes.

live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot

@@ -5,7 +5,3 @@ set -e
 # we want a really minimal image
 apt-get purge -y locales
 
-# this will also get rid of libqt5 - this can be removed once
-# system-image-cli in vivid does no longer depend on 
-# ubuntu-download-manager
-apt-get purge -y libicu52

live-build/ubuntu-cpc/hooks/032-disk-image.binary

@@ -34,7 +34,7 @@ rmdir mountpoint
 
 should_install_grub() {
     case $architecture in
-        armhf|arm64)
+        armhf|arm64|s390x)
             return 1
             ;;
         *)
@@ -56,5 +56,30 @@ if should_install_grub; then
     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

live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot

@@ -142,6 +142,10 @@ if [[ "$arch" =~ (arm|arm64|aarch64) ]]; then
    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

live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early

@@ -279,7 +279,7 @@ fi
 if [ -n "$ERRCNT" ]; then
         echo "There were changes to the password database," >&2
         echo "please adjust the values in the livecd-rootfs source in the file:" >&2
-        echo "live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early" >&2
+        echo "live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early" >&2
         echo >&2
         echo "Please check also if a maintainer script of the package" >&2
         echo "that added these entries perhaps created a home directory and," >&2