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

Support passing IMAGE_FLAVORS in the environment, to limit which images

Browse Source 
are output as part of a build; particularly useful for ubuntu-cpc builds
which output multiple image types.
This commit is contained in:
Steve Langasek 2017-02-06 22:12:32 -08:00
parent e93ed188f6
commit 8ba3a00622
6 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.440) UNRELEASED; urgency=medium
* Support passing IMAGE_FLAVORS 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.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 06 Feb 2017 22:09:17 -0800
livecd-rootfs (2.439) zesty; urgency=medium livecd-rootfs (2.439) zesty; urgency=medium
* Fix the manifest generation in OVA files so that ovf files don't have * Fix the manifest generation in OVA files so that ovf files don't have

3
live-build/auto/config
View File

@ -618,6 +618,9 @@ lb config noauto \
echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> config/binary echo "BUILDSTAMP=\"$NOW\"" >> config/binary
if [ -n "$IMAGE_FLAVORS" ]; then
echo "LB_IMAGE_FLAVORS="$IMAGE_FLAVORS" >> config/binary
fi
case $ARCH+$SUBARCH in case $ARCH+$SUBARCH in
armhf+raspi2) armhf+raspi2)

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

@ -1,5 +1,14 @@
#!/bin/bash -ex #!/bin/bash -ex
case $LB_IMAGE_FLAVORS 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 $LB_IMAGE_FLAVORS 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

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

@ -14,6 +14,16 @@ case $ARCH in
*) echo "OVA images are not supported for $ARCH yet."; *) echo "OVA images are not supported for $ARCH yet.";
exit 0;; exit 0;;
esac esac
case $LB_IMAGE_FLAVORS in
""|*ova*)
;;
*)
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 $LB_IMAGE_FLAVORS 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}))