Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-05 07:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge lp:~rbalint/livecd-rootfs/xz

Browse Source
This commit is contained in:
Steve Langasek 2017-06-30 13:19:11 -07:00
commit a8a6d208f6
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -2,8 +2,11 @@ livecd-rootfs (2.448) UNRELEASED; urgency=medium
[ Balint Reczey ] [ Balint Reczey ]
* Depend on packages in main instead of installing them at runtime * Depend on packages in main instead of installing them at runtime
* Depend on pxz and vmdk-stream-converter instead of installing them * Depend on vmdk-stream-converter instead of installing it at run time
at run time * Use xz -T4 -0 instead of pxz (LP: #1701132)
Supported xz versions before 5.2 also accept the -T4 option but ignore
it.
* Depend on xz-utils instead of pxz
[ Mathieu Trudel-Lapierre ] [ Mathieu Trudel-Lapierre ]
* auto/config: enable Debug::pkgDepCache::AutoInstall so tracking down * auto/config: enable Debug::pkgDepCache::AutoInstall so tracking down

2
debian/control vendored
View File

@ -25,7 +25,6 @@ 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,
@ -35,6 +34,7 @@ Depends: ${misc:Depends},
sudo, sudo,
ubuntu-image, ubuntu-image,
vmdk-stream-converter [amd64 i386], vmdk-stream-converter [amd64 i386],
xz-utils,
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

@ -20,7 +20,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
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
pxz -T4 livecd."$PROJECT".img xz -0 -T4 livecd."$PROJECT".img
exit 0 exit 0
fi fi

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

@ -13,7 +13,7 @@ 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)
pxz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz xz -0 -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
exit 0 exit 0
;; ;;
esac esac