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

Per discussion with Adam, don't make this an LB_ variable since it's not actually part of live-build; instead we will look to pass it into the environment through launchpad-buildd

Browse Source
This commit is contained in:
Steve Langasek 2017-02-07 10:19:03 -08:00
parent f04a535b0c
commit 53e1feefdb
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
live-build/auto/config
View File

@ -618,7 +618,6 @@ lb config noauto \
echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> config/binary
echo "LB_IMAGE_FLAVORS=\"$IMAGE_FLAVORS\"" >> config/binary
case $ARCH+$SUBARCH in
armhf+raspi2)

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

@ -1,6 +1,6 @@
#!/bin/bash -ex
case $LB_IMAGE_FLAVORS in
case $IMAGE_TARGETS in
""|*qcow2*)
;;
*)

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

@ -9,7 +9,7 @@ case $ARCH in
exit 0;;
esac
case $LB_IMAGE_FLAVORS in
case ${IMAGE_TARGETS:-} in
""|*vmdk*)
;;
*)

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

@ -15,7 +15,7 @@ case $ARCH in
exit 0;;
esac
case $LB_IMAGE_FLAVORS in
case ${IMAGE_TARGETS:-} in
""|*ova*)
;;
*)

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

@ -15,7 +15,7 @@
# some packages in it, convert it to a vmdk, and then assemble the vagrant
# box.
case $LB_IMAGE_FLAVORS in
case $IMAGE_TARGETS in
""|*vagrant*)
;;
*)