Merge lp:~rbalint/livecd-rootfs/deps into lp:livecd-rootfs

[Balint Reczey]

Listing all dependencies in d/control instead of installing them at runtime
would make tracking them easier and any breakage would be discovered early,
thanks to autopkgtest being trigggered for changes.

The packages pxz and vmdk-stream-converter are not in main, but since we use them
for generating images they should probably be promoted.

The extra resources needed for the installation of the packages is minimal compared to the needs of an lb config/build run.

[Balint Reczey (rbalint)]

git-remote-bzr broke on zesty, i have to fix this branch

[Balint Reczey (rbalint)]

Now the branch is fixed and rebased, please comment/merge.

[Steve Langasek (vorlon)]

LGTM in terms of the mechanics of the change; I like that we are surfacing the hidden dependency on universe packages. I think Adam had comments before on this approach and should have the final say.

review: Approve

[Adam Conrad (adconrad)]

If the real goal here was to get germinate to pull things in that we should be supporting, Recommends would have worked, and still install-on-demand because buildds don't install recommends by default.

I was initially against this, just cause I dislike having tools that install all the deps for any possible way you can use them, but my carefactor is low for livecd-rootfs in that it's currently only installed on buildds, really.

So, consider this a +0, I guess. I'm not a huge fan, but I also don't feel strongly enough to veto it.

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-06 07:15:32 +0000
+++ debian/changelog	2017-06-14 16:26:38 +0000
@@ -1,3 +1,11 @@
+livecd-rootfs (2.447) UNRELEASED; urgency=medium
+
+  * Depend on packages in main instead of installing them at runtime
+  * Depend on pxz and vmdk-stream-converter instead of installing them
+    at run time
+
+ -- Balint Reczey <[e-mail]>  Wed, 14 Jun 2017 18:25:32 +0200
+
 livecd-rootfs (2.446) artful; urgency=medium
 
   * Build ubuntu back with tasks. The metapackage switch was due to g++

=== modified file 'debian/control'
--- debian/control	2017-04-28 20:30:18 +0000
+++ debian/control	2017-06-14 16:26:38 +0000
@@ -12,21 +12,30 @@
          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,
+         pxz,
          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],
+         zerofree
 Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2017-04-29 01:02:16 +0000
+++ live-build/auto/build	2017-06-14 16:26:38 +0000
@@ -17,8 +17,6 @@
 
 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

=== modified file 'live-build/functions'
--- live-build/functions	2017-04-29 03:44:09 +0000
+++ live-build/functions	2017-06-14 16:26:38 +0000
@@ -8,8 +8,6 @@
 loop_raw=
 backing_img=
 
-apt-get -qqy install dosfstools gdisk
-
 clean_loops() {
     local kpartx_ret
     local kpartx_stdout
@@ -51,7 +49,6 @@
 }
 
 mount_image() {
-    apt-get install -qqy kpartx
     trap clean_loops EXIT
     backing_img="$1"
     local rootpart="$2"
@@ -158,7 +155,6 @@
 
         # 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,7 +226,6 @@
     destination="$2"
     size="${3:-10240}"
 
-    apt-get install -qqy qemu-utils vmdk-stream-converter
     streamconverter="/usr/share/pyshared/VMDKstream.py"
     scratch_d=$(mktemp -d)
     cp ${src} ${scratch_d}/resize.img
@@ -263,8 +258,6 @@
 }
 
 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"

=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
--- live-build/ubuntu-cpc/hooks/032-disk-image.binary	2017-04-11 21:30:48 +0000
+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary	2017-06-14 16:26:38 +0000
@@ -32,8 +32,6 @@
 esac
 
 create_empty_partition_table() {
-    apt-get install -qqy parted
-
     parted "$1" --script -- mklabel msdos
 }
 

=== modified file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary'
--- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2017-04-11 21:30:48 +0000
+++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2017-06-14 16:26:38 +0000
@@ -43,8 +43,6 @@
 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"
 

=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2017-04-12 02:10:56 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2017-06-14 16:26:38 +0000
@@ -14,8 +14,6 @@
 
 . config/functions
 
-apt-get -qqy install dosfstools gdisk
-
 create_partitions() {
     disk_image="$1"
     sgdisk "${disk_image}" --zap-all

=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2017-04-12 02:10:56 +0000
+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2017-06-14 16:26:38 +0000
@@ -14,7 +14,6 @@
 
 create_partitions() {
     disk_image="$1"
-    apt-get install -qqy gdisk
     sgdisk "${disk_image}" \
         --zap-all
     sgdisk "${disk_image}" \

=== modified file 'live-build/ubuntu-cpc/hooks/040-qcow2-image.binary'
--- live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2017-04-11 21:30:48 +0000
+++ live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2017-06-14 16:26:38 +0000
@@ -13,14 +13,11 @@
 	# 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
 		;;
 esac
 
-apt-get install -qqy qemu-utils
-
 . config/functions
 
 if [ -f binary/boot/disk-uefi.ext4 ]; then

=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-04-11 21:30:48 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-06-14 16:26:38 +0000
@@ -46,9 +46,6 @@
 
 . 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)

=== modified file 'live-build/ubuntu-server/hooks/030-root-squashfs.binary'
--- live-build/ubuntu-server/hooks/030-root-squashfs.binary	2017-04-11 21:16:35 +0000
+++ live-build/ubuntu-server/hooks/030-root-squashfs.binary	2017-06-14 16:26:38 +0000
@@ -25,8 +25,6 @@
 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"
 

=== modified file 'live-build/ubuntu-server/hooks/032-installer-squashfs.binary'
--- live-build/ubuntu-server/hooks/032-installer-squashfs.binary	2017-04-11 21:16:35 +0000
+++ live-build/ubuntu-server/hooks/032-installer-squashfs.binary	2017-06-14 16:26:38 +0000
@@ -159,8 +159,6 @@
 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/" &&