Import patches-unapplied version 2.448 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 402cae06bd

New changelog entries:
  [ Balint Reczey ]
  * Depend on packages in main instead of installing them at runtime
  * Depend on vmdk-stream-converter instead of installing it at run time
  * Use xz -T4 -0 instead of pxz (LP: #1701132)
    Supported xz versions before 5.2 also accept the -T4 option but ignore
    it.
  * Depend on xz-utils instead of pxz
  [ Mathieu Trudel-Lapierre ]
  * auto/config: enable Debug::pkgDepCache::AutoInstall so tracking down
    dependency bugs in the livefs is a little clearer.
  [ Robert C Jennings ]
  * live-build/functions: Update path for VMDKstream.py (LP: #1706116)

debian/changelog

@@ -1,3 +1,22 @@
+livecd-rootfs (2.448) artful; urgency=medium
+
+  [ Balint Reczey ]
+  * Depend on packages in main instead of installing them at runtime
+  * Depend on vmdk-stream-converter instead of installing it at run time
+  * Use xz -T4 -0 instead of pxz (LP: #1701132)
+    Supported xz versions before 5.2 also accept the -T4 option but ignore
+    it.
+  * Depend on xz-utils instead of pxz
+
+  [ Mathieu Trudel-Lapierre ]
+  * auto/config: enable Debug::pkgDepCache::AutoInstall so tracking down
+    dependency bugs in the livefs is a little clearer.
+
+  [ Robert C Jennings ]
+  * live-build/functions: Update path for VMDKstream.py (LP: #1706116)
+
+ -- Brian Murray <brian@ubuntu.com>  Mon, 24 Jul 2017 11:06:24 -0700
+
 livecd-rootfs (2.447) artful; urgency=medium
 
   * Add cm3 as a known ubuntu-core image type.  LP: #1698223.

debian/control

@@ -12,21 +12,30 @@ Depends: ${misc:Depends},
          android-tools-fsutils [armhf],
          apt-utils,
          debootstrap,
+         dosfstools,
          e2fsprogs,
+         gdisk,
+         genisoimage,
          germinate (>= 1.25.1),
          gnupg,
          grep-dctrl,
+         kpartx,
          live-build (>= 3.0~a57-1ubuntu12~),
          lsb-release,
          lzma,
+         parted,
          procps,
          python-minimal | python,
          python3-software-properties,
+         qemu-utils,
          rsync,
          snapd,
          squashfs-tools (>= 1:3.3-1),
          sudo,
-         ubuntu-image
+         ubuntu-image,
+         vmdk-stream-converter [amd64 i386],
+         xz-utils,
+         zerofree
 Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs

live-build/auto/build

@@ -17,12 +17,10 @@ fi
 
 if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 	# Use ubuntu-image instead of live-build
-	apt-get install -qqy pxz
-
 	env SNAPPY_STORE_NO_CDN=1 \
 	ubuntu-image -c edge \
 		-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
-	pxz -T4 livecd."$PROJECT".img
+	xz -0 -T4 livecd."$PROJECT".img
 	exit 0
 fi
 

live-build/auto/config

@@ -94,6 +94,8 @@ PREINSTALL_POOL_SEEDS=
 CHROOT_HOOKS=
 BINARY_HOOKS=
 
+APT_OPTIONS=" --yes -oDebug::pkgDepCache::AutoInstall=yes "
+
 add_chroot_hook ()
 {
 	CHROOT_HOOKS="${CHROOT_HOOKS:+$CHROOT_HOOKS }$1"
@@ -343,7 +345,7 @@ case $PROJECT in
 
 		# The Lubuntu STRUCTURE file has "feature
 		# no-follow-recommends".  Mirror this.
-		export APT_OPTIONS="--yes --no-install-recommends"
+		APT_OPTIONS="${APT_OPTIONS} --no-install-recommends"
 		;;
 
 	lubuntu-next)
@@ -359,7 +361,7 @@ case $PROJECT in
 
 		# The Lubuntu STRUCTURE file has "feature
 		# no-follow-recommends". Mirror this.
-		export APT_OPTIONS="--yes --no-install-recommends"
+		APT_OPTIONS="${APT_OPTIONS} --no-install-recommends"
 		;;
 
 	ubuntu-gnome)
@@ -557,6 +559,8 @@ case $PROJECT in
 		;;
 esac
 
+export APT_OPTIONS
+
 if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then
 	add_task live "$LIVE_TASK"
 fi

live-build/functions

@@ -8,8 +8,6 @@ loop_device=
 loop_raw=
 backing_img=
 
-apt-get -qqy install dosfstools gdisk
-
 clean_loops() {
     local kpartx_ret
     local kpartx_stdout
@@ -51,7 +49,6 @@ make_ext4_partition() {
 }
 
 mount_image() {
-    apt-get install -qqy kpartx
     trap clean_loops EXIT
     backing_img="$1"
     local rootpart="$2"
@@ -158,7 +155,6 @@ umount_partition() {
 
         # both of these are likely overkill, but it does result in slightly
         # smaller ext4 filesystem
-        apt-get -qqy install zerofree
         e2fsck -y -E discard ${rootfs_dev_mapper}
         zerofree ${rootfs_dev_mapper}
     fi
@@ -230,8 +226,7 @@ create_vmdk() {
     destination="$2"
     size="${3:-10240}"
 
-    apt-get install -qqy qemu-utils vmdk-stream-converter
+    streamconverter="/usr/lib/python2.7/dist-packages/VMDKstream.py"
-    streamconverter="/usr/share/pyshared/VMDKstream.py"
     scratch_d=$(mktemp -d)
     cp ${src} ${scratch_d}/resize.img
 
@@ -263,8 +258,6 @@ create_derivative() {
 }
 
 convert_to_qcow2() {
-    apt-get install -qqy qemu-utils
-
     src="$1"
     destination="$2"
     qemu-img convert -c -O qcow2 -o compat=0.10 "$src" "$destination"

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

@@ -32,8 +32,6 @@ case $ARCH:$SUBARCH in
 esac
 
 create_empty_partition_table() {
-    apt-get install -qqy parted
-
     parted "$1" --script -- mklabel msdos
 }
 

live-build/ubuntu-cpc/hooks/032-root-squashfs.binary

@@ -43,8 +43,6 @@ umount "binary/boot/squashfs.dir/dev/pts"
 umount "binary/boot/squashfs.dir/dev"
 umount "binary/boot/squashfs.dir/tmp"
 
-apt-get -qqy install squashfs-tools
-
 squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"
 squashfs_f_manifest="${squashfs_f}.manifest"
 

live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary

@@ -14,8 +14,6 @@ FS_LABEL="cloudimg-rootfs"
 
 . config/functions
 
-apt-get -qqy install dosfstools gdisk
-
 create_partitions() {
     disk_image="$1"
     sgdisk "${disk_image}" --zap-all

live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary

@@ -14,7 +14,6 @@ FS_LABEL="cloudimg-rootfs"
 
 create_partitions() {
     disk_image="$1"
-    apt-get install -qqy gdisk
     sgdisk "${disk_image}" \
         --zap-all
     sgdisk "${disk_image}" \

live-build/ubuntu-cpc/hooks/040-qcow2-image.binary

@@ -13,14 +13,11 @@ case $ARCH:$SUBARCH in
 	# Not sure if any other cloud images use subarch for something that
 	# should take qcow2 format, so only skipping this on raspi2 for now.
 	armhf:raspi2)
-		apt-get install -qqy pxz
+		xz -0 -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
-		pxz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
 	        exit 0
 		;;
 esac
 
-apt-get install -qqy qemu-utils
-
 . config/functions
 
 if [ -f binary/boot/disk-uefi.ext4 ]; then

live-build/ubuntu-cpc/hooks/042-vagrant.binary

@@ -46,9 +46,6 @@ esac
 
 . config/functions
 
-# Virtualbox is needed for making a small VMDK
-apt-get -qqy install genisoimage qemu-utils
-
 # Lets be safe about this
 box_d=$(mktemp -d)
 seed_d=$(mktemp -d)

live-build/ubuntu-server/hooks/030-root-squashfs.binary

@@ -25,8 +25,6 @@ fi
 mkdir binary/boot/squashfs.dir
 cp -a chroot/* binary/boot/squashfs.dir
 
-apt-get -qqy install squashfs-tools
-
 squashfs_f="${PWD}/livecd.${PROJECT}.squashfs"
 squashfs_f_manifest="${squashfs_f}.manifest"
 

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

@@ -159,8 +159,6 @@ umount "binary/boot/squashfs.dir/dev/pts"
 umount "binary/boot/squashfs.dir/dev"
 umount "binary/boot/squashfs.dir/tmp"
 
-apt-get -qqy install squashfs-tools
-
 squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
 
 (cd "$OVERLAY_ROOT/" &&