diff --git a/debian/changelog b/debian/changelog index c7c3cdb7..dc41af3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ livecd-rootfs (2.562) UNRELEASED; urgency=medium * subiquity: make subiqutiy_config.mount optional + * Add python3 vmdkstream support -- Dimitri John Ledkov Mon, 18 Feb 2019 10:26:53 +0100 diff --git a/debian/control b/debian/control index 20d3f925..5d2c9049 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Depends: ${misc:Depends}, parted, procps, python-minimal | python, + python3-minimal | python3, python3-apt, python3-software-properties, qemu-utils, @@ -37,7 +38,7 @@ Depends: ${misc:Depends}, sudo, u-boot-tools [armhf arm64], ubuntu-image, - vmdk-stream-converter [amd64 i386], + python3-vmdkstream [amd64 i386] | vmdk-stream-converter [amd64 i386], xz-utils, zerofree Breaks: ubuntu-defaults-builder (<< 0.32) diff --git a/live-build/functions b/live-build/functions index d6978f86..31a5ab8f 100644 --- a/live-build/functions +++ b/live-build/functions @@ -271,7 +271,7 @@ create_vmdk() { cp ${src} ${scratch_d}/resize.img truncate --size=${size}M ${scratch_d}/resize.img - python -m ${streamconverter} ${scratch_d}/resize.img ${destination} + python3 -m ${streamconverter} ${scratch_d}/resize.img ${destination} || python2 -m ${streamconverter} ${scratch_d}/resize.img ${destination} modify_vmdk_header ${destination} qemu-img info ${destination}