live-build/auto/build: live-build now calls hybrid ISO9660 images

binary.hybrid.iso rather than binary-hybrid.iso.
This commit is contained in:
Colin Watson 2012-09-03 18:41:20 +01:00
parent a0cb9f029a
commit c6eda4d9b2
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.82) UNRELEASED; urgency=low
* live-build/auto/build: live-build now calls hybrid ISO9660 images
binary.hybrid.iso rather than binary-hybrid.iso.
-- Colin Watson <cjwatson@ubuntu.com> Mon, 03 Sep 2012 18:40:40 +0100
livecd-rootfs (2.81) quantal; urgency=low
* live-build/auto/config: Disable zsync for BINARYFORMAT=iso*|usb* builds.

View File

@ -290,7 +290,7 @@ for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do
chmod 644 "$PREFIX.$OUTPUT"
done
for ISO in binary.iso binary-hybrid.iso; do
for ISO in binary.iso binary.hybrid.iso; do
[ -e "$ISO" ] || continue
ln "$ISO" "$PREFIX.iso"
chmod 644 "$PREFIX.iso"