Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-20 18:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Depend on pxz and vmdk-stream-converter instead of installing them at runtime

Browse Source
This commit is contained in:
Balint Reczey 2017-06-14 18:25:15 +02:00
parent aa54a130c3
commit 6c9cf10d72
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -25,6 +25,7 @@ Depends: ${misc:Depends},
lzma, lzma,
parted, parted,
procps, procps,
pxz,
python-minimal | python, python-minimal | python,
python3-software-properties, python3-software-properties,
qemu-utils, qemu-utils,
@ -33,6 +34,7 @@ Depends: ${misc:Depends},
squashfs-tools (>= 1:3.3-1), squashfs-tools (>= 1:3.3-1),
sudo, sudo,
ubuntu-image, ubuntu-image,
vmdk-stream-converter [amd64 i386],
zerofree zerofree
Suggests: partimage Suggests: partimage
Breaks: ubuntu-defaults-builder (<< 0.32) Breaks: ubuntu-defaults-builder (<< 0.32)

2
live-build/auto/build
View File

@ -17,8 +17,6 @@ fi
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build # Use ubuntu-image instead of live-build
apt-get install -qqy pxz
env SNAPPY_STORE_NO_CDN=1 \ env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image -c edge \ ubuntu-image -c edge \
-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion -o livecd."$PROJECT".img livecd."$PROJECT".model-assertion

1
live-build/functions
View File

@ -226,7 +226,6 @@ create_vmdk() {
destination="$2" destination="$2"
size="${3:-10240}" size="${3:-10240}"
apt-get install -qqy vmdk-stream-converter
streamconverter="/usr/share/pyshared/VMDKstream.py" streamconverter="/usr/share/pyshared/VMDKstream.py"
scratch_d=$(mktemp -d) scratch_d=$(mktemp -d)
cp ${src} ${scratch_d}/resize.img cp ${src} ${scratch_d}/resize.img

1
live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
View File

@ -13,7 +13,6 @@ case $ARCH:$SUBARCH in
# Not sure if any other cloud images use subarch for something that # Not sure if any other cloud images use subarch for something that
# should take qcow2 format, so only skipping this on raspi2 for now. # should take qcow2 format, so only skipping this on raspi2 for now.
armhf:raspi2) armhf:raspi2)
apt-get install -qqy pxz
pxz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz pxz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
exit 0 exit 0
;; ;;