Imported 2.597

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,21 @@
+livecd-rootfs (2.597) eoan; urgency=medium
+
+  * Install s390-tools-zkey into the installer layer for zkey support in
+    subiquity.
+  * Unbreak cpc/server builds, by ensuring that includes are copied with
+    archived symlinks, and only hooks resolve symlinks when getting
+    copied.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 20 Jun 2019 23:25:13 +0100
+
+livecd-rootfs (2.596) eoan; urgency=medium
+
+  * Add tzdata to buildd images.  It isn't strictly build-essential, but it
+    has traditionally been present in both Debian and Ubuntu, and a variety
+    of things fail without it.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 19 Jun 2019 23:21:56 +0100
+
 livecd-rootfs (2.595) eoan; urgency=medium
 
   * Remove dangling symlink

live-build/auto/config

@@ -813,6 +813,9 @@ case $SUBPROJECT in
 		add_package install build-essential
 		# Needed for LXD-based builds.
 		add_package install init
+		# Not strictly build-essential, but traditionally present
+		# and a variety of things fail without it.
+		add_package install tzdata
 
 		cp -af /usr/share/livecd-rootfs/live-build/make-lxd-metadata.py config/make-lxd-metadata
 		;;
@@ -1100,8 +1103,20 @@ EOF
 		;;
 
 	ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled)
-		cp -afL /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
-			config/
+		# Ensure that most things e.g. includes.chroot are copied as is
+		for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
+			case entry in
+				hooks)
+					# But hooks are shared across the projects with symlinks
+					# dereference them
+					cp -afL $entry config/
+					;;
+				*)
+					# Most places want to preserve symlinks as is
+					cp -af $entry config/
+					;;
+			esac
+		done
 
 		if [ "$PROJECT" = "ubuntu-cpc" ]; then
 			case ${IMAGE_TARGETS:-} in

live-build/ubuntu-server/hooks/032-installer-squashfs.binary

@@ -54,6 +54,9 @@ EOF
 
 # Install casper for live session magic.
 chroot $INSTALLER_ROOT apt-get -y install lupin-casper
+if [ `dpkg --print-architecture` = s390x ]; then
+	chroot $INSTALLER_ROOT apt-get -y install s390-tools-zkey
+fi
 chroot $INSTALLER_ROOT apt-get clean
 
 # For bug #1743643 "Install to dirty disk with swap fails" remove the