From 53e1feefdbe6a33c161ddaa9c672b850c984a1a2 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 7 Feb 2017 10:19:03 -0800 Subject: [PATCH] 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 --- live-build/auto/config | 1 - live-build/ubuntu-cpc/hooks/040-qcow2-image.binary | 2 +- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary | 2 +- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary | 2 +- live-build/ubuntu-cpc/hooks/042-vagrant.binary | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 7533ac01..8a5e64b9 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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) diff --git a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary index 5bcc6472..f9ab7e62 100755 --- a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary +++ b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary @@ -1,6 +1,6 @@ #!/bin/bash -ex -case $LB_IMAGE_FLAVORS in +case $IMAGE_TARGETS in ""|*qcow2*) ;; *) diff --git a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary index cb986c64..9a71f7ff 100755 --- a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary +++ b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary @@ -9,7 +9,7 @@ case $ARCH in exit 0;; esac -case $LB_IMAGE_FLAVORS in +case ${IMAGE_TARGETS:-} in ""|*vmdk*) ;; *) diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary index 97a0f2cc..21d9fc3a 100755 --- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary +++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary @@ -15,7 +15,7 @@ case $ARCH in exit 0;; esac -case $LB_IMAGE_FLAVORS in +case ${IMAGE_TARGETS:-} in ""|*ova*) ;; *) diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary index 9300683a..bd9906f2 100755 --- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary +++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary @@ -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*) ;; *)