Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use python3 vmdkstream exclusively; we should not fall back to python2.

Browse Source
This commit is contained in:
Steve Langasek 2019-02-18 18:06:01 +01:00
parent b5ff7a0618
commit 7e4a2627ed
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.564) UNRELEASED; urgency=medium
* Use python3 vmdkstream exclusively; we should not fall back to python2.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 18 Feb 2019 18:02:37 +0100
livecd-rootfs (2.563) disco; urgency=medium
* Make sure buildd images have a /usr/sbin/policy-rc.d symlink.

2
debian/control vendored
View File

@ -38,7 +38,7 @@ Depends: ${misc:Depends},
sudo,
u-boot-tools [armhf arm64],
ubuntu-image,
python3-vmdkstream [amd64 i386] | vmdk-stream-converter [amd64 i386],
python3-vmdkstream [amd64 i386],
xz-utils,
zerofree
Breaks: ubuntu-defaults-builder (<< 0.32)

2
live-build/functions
View File

@ -271,7 +271,7 @@ create_vmdk() {
cp ${src} ${scratch_d}/resize.img
truncate --size=${size}M ${scratch_d}/resize.img
python3 -m ${streamconverter} ${scratch_d}/resize.img ${destination} || python2 -m ${streamconverter} ${scratch_d}/resize.img ${destination}
python3 -m ${streamconverter} ${scratch_d}/resize.img ${destination}
modify_vmdk_header ${destination}
qemu-img info ${destination}