diff --git a/debian/changelog b/debian/changelog index 4efb89f1..7388d869 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.408.25) UNRELEASED; urgency=medium + + * Sort and list dependencies nicely + * Depend on packages instead of installing them at run time + * Use xz -T4 instead of pxz. + Supported xz versions before 5.2 accept the -T4 option but ignore it. + Also depend on xz-utils instead of downloading pxz. (LP: #1701132) + + -- Balint Reczey Tue, 05 Dec 2017 22:43:06 +0100 + livecd-rootfs (2.408.24) xenial; urgency=medium * For the IMAGEFORMAT=none parts to work for ubuntu-image classic builds, we diff --git a/debian/control b/debian/control index de508def..fd7f72f1 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,31 @@ Vcs-Bzr: lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed/ Package: livecd-rootfs Architecture: any -Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a57-1ubuntu25.5~), android-tools-fsutils [armhf], python3-software-properties +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-1ubuntu25.5~), + lsb-release, + lzma, + parted, + procps, + python-minimal | python, + python3-software-properties, + qemu-utils, + rsync, + squashfs-tools (>= 1:3.3-1), + vmdk-stream-converter [amd64 i386], + xz-utils, + zerofree Suggests: partimage Breaks: ubuntu-defaults-builder (<< 0.32) Description: construction script for the livecd rootfs diff --git a/live-build/ubuntu-cpc/functions b/live-build/ubuntu-cpc/functions index 49aa4313..0af43d94 100644 --- a/live-build/ubuntu-cpc/functions +++ b/live-build/ubuntu-cpc/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" @@ -153,7 +150,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 @@ -227,7 +223,6 @@ create_vmdk() { 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 @@ -260,7 +255,6 @@ create_derivative() { } convert_to_qcow2() { - apt-get install -qqy qemu-utils src="$1" destination="$2" diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary index 3ef98106..f4b7a86d 100755 --- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary +++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary @@ -27,8 +27,6 @@ case $ARCH:$SUBARCH in esac create_empty_partition_table() { - apt-get install -qqy parted - parted "$1" --script -- mklabel msdos } diff --git a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary b/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary index 9e3bb61e..c3f492fc 100755 --- a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary @@ -7,8 +7,6 @@ if [ -n "$SUBARCH" ]; then exit 0 fi -apt-get -qqy install squashfs-tools - squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs" squashfs_f_manifest="${squashfs_f}.manifest" diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary index da1d18dc..3447ca54 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -11,8 +11,6 @@ esac . config/functions -apt-get -qqy install dosfstools gdisk - create_partitions() { disk_image="$1" sgdisk "${disk_image}" --zap-all @@ -128,7 +126,6 @@ EOF rm mountpoint/tmp/device.map umount mountpoint/boot/efi - apt-get install -qqy udev mount umount_partition mountpoint rmdir mountpoint diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary index 7891f639..7bafd9e0 100755 --- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary @@ -11,7 +11,6 @@ esac create_partitions() { disk_image="$1" - apt-get install -qqy gdisk sgdisk "${disk_image}" \ --zap-all sgdisk "${disk_image}" \ diff --git a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary index 03ac69f1..1180a1e8 100755 --- a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary +++ b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary @@ -4,13 +4,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 - pxz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz + xz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz exit 0 ;; esac -apt-get install -qqy qemu-utils . config/functions diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary index 90aedfdf..c52f6f38 100755 --- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary +++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary @@ -37,9 +37,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)