Add python3 vmdkstream support

This commit is contained in:
Dimitri John Ledkov 2019-02-18 12:01:25 +01:00
parent 89dee6610d
commit a77ec4a9df
No known key found for this signature in database
GPG Key ID: E8E84908F903AFB5
3 changed files with 4 additions and 2 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
livecd-rootfs (2.562) UNRELEASED; urgency=medium
* subiquity: make subiqutiy_config.mount optional
* Add python3 vmdkstream support
-- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 18 Feb 2019 10:26:53 +0100

3
debian/control vendored
View File

@ -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)

View File

@ -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}