From 6c9cf10d7214a57ee41de98f4b3d7ea9d1306d37 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.reczey@canonical.com>
Date: Wed, 14 Jun 2017 18:25:15 +0200
Subject: [PATCH] Depend on pxz and vmdk-stream-converter instead of installing
 them at runtime

---
 debian/control                                     | 2 ++
 live-build/auto/build                              | 2 --
 live-build/functions                               | 1 -
 live-build/ubuntu-cpc/hooks/040-qcow2-image.binary | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 6107cbb6..b2715e32 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Depends: ${misc:Depends},
          lzma,
          parted,
          procps,
+         pxz,
          python-minimal | python,
          python3-software-properties,
          qemu-utils,
@@ -33,6 +34,7 @@ Depends: ${misc:Depends},
          squashfs-tools (>= 1:3.3-1),
          sudo,
          ubuntu-image,
+         vmdk-stream-converter [amd64 i386],
          zerofree
 Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
diff --git a/live-build/auto/build b/live-build/auto/build
index 50bc8333..e909a00a 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -17,8 +17,6 @@ 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
diff --git a/live-build/functions b/live-build/functions
index f89d22f9..58810fb7 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -226,7 +226,6 @@ create_vmdk() {
     destination="$2"
     size="${3:-10240}"
 
-    apt-get install -qqy vmdk-stream-converter
     streamconverter="/usr/share/pyshared/VMDKstream.py"
     scratch_d=$(mktemp -d)
     cp ${src} ${scratch_d}/resize.img
diff --git a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
index a1233dfd..e98999c4 100755
--- a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
+++ b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
@@ -13,7 +13,6 @@ 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
 		pxz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
 	        exit 0
 		;;