Archive build to pass USE flags to subcommands.

archive_build.sh

Index: archive_build.sh
diff --git a/archive_build.sh b/archive_build.sh
index 63224a6378729a6681f393802d58fb7ee63271b1..f442493bf38ee38811caee6840e55011b97b872d 100755
--- a/archive_build.sh
+++ b/archive_build.sh
@@ -35,6 +35,9 @@ IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images"
 DEFAULT_TO="${GCLIENT_ROOT}/archive"
 DEFAULT_FROM="${IMAGES_DIR}/$DEFAULT_BOARD/$(ls -t1 \
               $IMAGES_DIR/$DEFAULT_BOARD 2>&-| head -1)"
+# The set of environment assignment we need to pass to enter_chroots for this
+# build.  e.g. USE flags alter some of the commands' effect.
+CHROOT_ENV=""
 
 # Flags
 DEFINE_boolean archive_debug $FLAGS_TRUE \
@@ -71,6 +74,8 @@ DEFINE_boolean prebuilt_upload $FLAGS_FALSE "Upload prebuilt binary packages."
 DEFINE_boolean remove_dev $FLAGS_TRUE "Remove the de image during archive."
 DEFINE_string to "$DEFAULT_TO" "Directory of build archive"
 DEFINE_string zipname "image.zip" "Name of zip file to create."
+DEFINE_string useflags "" \
+    "Space separated flags specifying types of pieces to assemble of modify."

[davidjames, 2011/04/25 20:58:19]

Lots of other scripts accept USE flags, and they do so via environment variable
instead of command-line options. Why is this script an exception?

Understood that environment variables are maybe a pain. But Emerge uses
environment variables for its interface, and sosa@ recently converted gmerge
from using command-line options to environment variables. So I'm thinking we
should try to stick to one way of doing this for consistency...

[davidjames, 2011/04/28 19:02:14]

Could you clarify this comment? "Space separated flags specifying types of
pieces to assemble of modify." Better would just to say "USE flags to pass in to
emerge."

[Peter Mayo, 2011/04/29 20:09:55]

I'm OK with dropping space separated, and referencing commands we call more
explicitly, but I don't like specifying one we don't actually call.  We call
mod_image_for_recovery, mod_image_for_test and build_image. They are the ones
that do the wrong things without the variable set.  They are called through
enter_chroot, so either them or enter_chroot makes sense to references, IMHO.

 
 # Parse command line
 FLAGS "$@" || exit 1
@@ -90,6 +95,10 @@ fi
 # Die on any errors.
 set -e
 
+if [ -n "${FLAGS_useflags}" ]; then
+  CHROOT_ENV="${CHROOT_ENV} USE='${FLAGS_useflags}'"
+fi
+
 if [ -z "$DEFAULT_USED" ]; then
   if [ $FLAGS_test_mod -eq $FLAGS_TRUE ] || \
      [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ] || \
@@ -144,8 +153,8 @@ mkdir -p "$OUTDIR"
 # Modify image for test if flag set.
 if [ $FLAGS_test_mod -eq $FLAGS_TRUE ]; then
   echo "Modifying image for test"
-  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
-      --noinplace --yes
+  ./enter_chroot.sh $CHROOT_ENV -- ./mod_image_for_test.sh \
+    --board $FLAGS_board --noinplace --yes
 
   pushd "${FLAGS_chroot}/build/${FLAGS_board}/usr/local"
   echo "Archiving autotest build artifacts"
@@ -157,8 +166,8 @@ fi
 if [ $FLAGS_official_build -eq $FLAGS_TRUE ]; then
   BUILDVER="$(readlink ${IMAGES_DIR}/${FLAGS_board}/latest)"
   CHROOT_IMAGE_DIR=/home/$USER/trunk/src/build/images/$FLAGS_board/$BUILDVER
-  ./enter_chroot.sh -- ./mod_image_for_recovery.sh --board $FLAGS_board \
-    --image $CHROOT_IMAGE_DIR/chromiumos_base_image.bin
+  ./enter_chroot.sh $CHROOT_ENV -- ./mod_image_for_recovery.sh \
+    --board $FLAGS_board --image $CHROOT_IMAGE_DIR/chromiumos_base_image.bin
 fi
 
 # Remove the developer build if test image is also built.
@@ -176,11 +185,11 @@ if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ]; then
   # zeroes out the current revision, which makes calling build_image directly
   # fail. You must explictly call replace and specify a unique name numerically
   # using build_attempt.
-  ./enter_chroot.sh -- ./build_image --board $FLAGS_board \
+  ./enter_chroot.sh $CHROOT_ENV -- ./build_image --board $FLAGS_board \
       --replace --noenable_rootfs_verification --build_attempt 4
 
-  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
-      --yes --noinplace --factory
+  ./enter_chroot.sh $CHROOT_ENV -- ./mod_image_for_test.sh \
+      --board $FLAGS_board --yes --noinplace --factory
 
   # Get the factory test dir: It is the newest build.
   # This is the output dir for the factory shim, the factory test and
@@ -202,8 +211,8 @@ if [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]; then
   # zeroes out the current revision, which makes calling build_image directly
   # fail. You must explictly call replace and specify a unique name numerically
   # using build_attempt.
-  ./enter_chroot.sh -- ./build_image --board $FLAGS_board --factory_install \
-      --replace --build_attempt 7
+  ./enter_chroot.sh $CHROOT_ENV -- ./build_image --board $FLAGS_board \
+    --factory_install --replace --build_attempt 7
 
   # Get the install shim dir: It is the newest build.
   # This is the output dir for the factory shim, the factory test and