Support generating different binary image types using

BINARYFORMAT=iso-hybrid and so on (although this won't actually work
until we create a syslinux-themes-ubuntu package).
ubuntu/precise
Colin Watson 14 years ago
parent 26e1a2bdf4
commit b48b152420

8
debian/changelog vendored

@ -1,3 +1,11 @@
livecd-rootfs (2.15) UNRELEASED; urgency=low
* Support generating different binary image types using
BINARYFORMAT=iso-hybrid and so on (although this won't actually work
until we create a syslinux-themes-ubuntu package).
-- Colin Watson <cjwatson@ubuntu.com> Thu, 14 Jul 2011 18:26:02 +0100
livecd-rootfs (2.14) oneiric; urgency=low
* Handle package/task list changes in live-build 3.0~a22-1.

@ -51,7 +51,10 @@ add_package ()
OPTS=
COMPONENTS=
BINARY_REMOVE_LINUX=:
BINARY_IMAGES=none
MEMTEST=none
SOURCE='--source false'
BOOTLOADER=none
LIVE_TASK=
case $IMAGEFORMAT in
@ -72,6 +75,14 @@ case $IMAGEFORMAT in
;;
esac
case $BINARYFORMAT in
iso*|usb*)
BINARY_IMAGES="$BINARYFORMAT"
MEMTEST=memtest86+
BOOTLOADER=syslinux
;;
esac
case $PROJECT in
ubuntu|ubuntu-dvd)
add_task install minimal standard ubuntu-desktop
@ -170,8 +181,8 @@ lb config noauto \
--mode ubuntu \
--distribution "$SUITE" \
--bootstrap-keyring ubuntu-keyring \
--binary-images none \
--memtest none \
--binary-images "$BINARY_IMAGES" \
--memtest "$MEMTEST" \
$SOURCE \
--build-with-chroot false \
${MIRROR:+--parent-mirror-bootstrap $MIRROR} \
@ -179,7 +190,7 @@ lb config noauto \
--package-lists none \
${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \
--initsystem none \
--bootloader none \
--bootloader "$BOOTLOADER" \
--initramfs-compression lzma \
$OPTS

Loading…
Cancel
Save