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

Merge lp:~vorlon/livecd-rootfs/image-flavors/

Browse Source
This commit is contained in:
Steve Langasek 2017-02-27 22:34:19 -08:00
commit 738ff116a5
6 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -7,6 +7,9 @@ livecd-rootfs (2.440) UNRELEASED; urgency=medium
* live-build/ubuntu-cpc/functions: umount_partition: don't call * live-build/ubuntu-cpc/functions: umount_partition: don't call
umount_settle for each submount; just unmount them one by one and umount_settle for each submount; just unmount them one by one and
settle at the end. settle at the end.
* Support passing IMAGE_TARGETS in the environment, to limit which images
are output as part of a build; particularly useful for ubuntu-cpc builds
which output multiple image types.
[ Nishanth Aravamudan ] [ Nishanth Aravamudan ]
* live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot: generate iSCSI * live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot: generate iSCSI

9
live-build/ubuntu-cpc/hooks/032-root-squashfs.binary
View File

@ -3,6 +3,15 @@
# #
# Generate a squashfs root and manifest # Generate a squashfs root and manifest
case $IMAGE_TARGETS in
""|*squashfs*)
;;
*)
echo "Skipping squashfs build"
exit 0
;;
esac
if [ -n "$SUBARCH" ]; then if [ -n "$SUBARCH" ]; then
echo "Skipping rootfs build for subarch flavor build" echo "Skipping rootfs build for subarch flavor build"
exit 0 exit 0

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

@ -1,5 +1,14 @@
#!/bin/bash -ex #!/bin/bash -ex
case $IMAGE_TARGETS in
""|*qcow2*)
;;
*)
echo "Skipping qcow2 image build"
exit 0
;;
esac
case $ARCH:$SUBARCH in 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.

9
live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
View File

@ -9,6 +9,15 @@ case $ARCH in
exit 0;; exit 0;;
esac esac
case ${IMAGE_TARGETS:-} in
""|*vmdk*)
;;
*)
echo "Skipping VMDK image build"
exit 0
;;
esac
. /build/config/functions . /build/config/functions
if [ -e binary/boot/disk-uefi.ext4 ]; then if [ -e binary/boot/disk-uefi.ext4 ]; then

9
live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
View File

@ -27,6 +27,15 @@ case $ARCH in
exit 0;; exit 0;;
esac esac
case ${IMAGE_TARGETS:-} in
""|*vmdk*)
;;
*)
echo "Skipping OVA image build"
exit 0
;;
esac
cur_d=${PWD} cur_d=${PWD}
my_d=$(dirname $(readlink -f ${0})) my_d=$(dirname $(readlink -f ${0}))

9
live-build/ubuntu-cpc/hooks/042-vagrant.binary
View File

@ -15,6 +15,15 @@
# some packages in it, convert it to a vmdk, and then assemble the vagrant # some packages in it, convert it to a vmdk, and then assemble the vagrant
# box. # box.
case $IMAGE_TARGETS in
""|*vagrant*)
;;
*)
echo "Skipping Vagrant image build"
exit 0
;;
esac
cur_d=${PWD} cur_d=${PWD}
my_d=$(dirname $(readlink -f ${0})) my_d=$(dirname $(readlink -f ${0}))