build_image: provide USE flags when installing chromeos-dev

build_image

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 400 matching lines @@
   ${SCRIPTS_DIR}/mount_gpt_image.sh --from "${OUTPUT_DIR}" \
     --image "${image_name}" -r "${ROOT_FS_DIR}" \
     -s "${STATEFUL_FS_DIR}" -e "${ESP_FS_DIR}"
 
   # Determine the root dir for developer packages.
   local root_dev_dir="${ROOT_FS_DIR}"
   [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ] && \
     root_dev_dir="${ROOT_FS_DIR}/usr/local"
 
   # Install developer packages described in chromeos-dev.
-  sudo INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \
-      --root="${root_dev_dir}" --root-deps=rdeps \
+  sudo USE="${USE} ${EXTRA_USE}" INSTALL_MASK="${INSTALL_MASK}" \

[davidjames, 2011/04/05 20:09:43]

Thanks, can you also add the -E argument to sudo while you're at it?

+      ${EMERGE_BOARD_CMD} --root="${root_dev_dir}" --root-deps=rdeps \
       --usepkgonly -uDNv chromeos-dev ${EMERGE_JOBS}

[kliegs, 2011/04/05 20:14:05]

I thought you'd mentioned on IRC the need to remove the 'N'?

 
   if [[ $FLAGS_preserve -eq ${FLAGS_TRUE} ]] ; then
     # Clean out unused packages
-    sudo INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \
-      --root="${ROOT_FS_DIR}" --root-deps=rdeps \
+    sudo USE="${USE} ${EXTRA_USE}" INSTALL_MASK="${INSTALL_MASK}" \
+      ${EMERGE_BOARD_CMD} --root="${ROOT_FS_DIR}" --root-deps=rdeps \
       --usepkgonly --depclean ${EMERGE_JOBS}
   fi
 
   # Install the bare necessary files so that the "emerge" command works
   if [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ]; then
     sudo cp -a ${root_dev_dir}/share/portage ${ROOT_FS_DIR}/usr/share
     sudo sed -i s,/usr/bin/wget,wget, \
       ${ROOT_FS_DIR}/usr/share/portage/config/make.globals
   fi
   sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile
@@ skipping 60 matching lines @@
   echo "Updating base packages on ${image_name}"
 
   # Create stateful partition of the same size as the rootfs.
   trap "mount_gpt_cleanup" EXIT
 
   ${SCRIPTS_DIR}/mount_gpt_image.sh --from "${OUTPUT_DIR}" \
     --image "${image_name}" -r "${ROOT_FS_DIR}" \
     -s "${STATEFUL_FS_DIR}" -e "${ESP_FS_DIR}"
 
   # Emerge updated packages, exactly like when creating base image
   sudo USE="${EXTRA_USE}" INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \

[davidjames, 2011/04/05 20:09:43]

This should be updated as well to fix the --preserve case.

     --root="${ROOT_FS_DIR}" --root-deps=rdeps \
     --usepkgonly -uDNv chromeos ${EXTRA_PACKAGES} ${EMERGE_JOBS}
 
   # Clean out unused packages
   sudo INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \

[davidjames, 2011/04/05 20:09:43]

Same here.

     --root="${ROOT_FS_DIR}" --root-deps=rdeps \
     --usepkgonly --depclean ${EMERGE_JOBS}
 
   trap - EXIT
   ${SCRIPTS_DIR}/mount_gpt_image.sh -u -r "${ROOT_FS_DIR}" \
     -s "${STATEFUL_FS_DIR}" -e "${ESP_FS_DIR}"
 }
 
 zero_free_space() {
   local fs_mount_point=$1
@@ skipping 106 matching lines @@
   sudo mkdir -p "${ROOT_FS_DIR}/usr/local"
   sudo mount --bind "${DEV_IMAGE_ROOT}" "${ROOT_FS_DIR}/usr/local"
   sudo mkdir -p "${ROOT_FS_DIR}/var"
   sudo mount --bind "${STATEFUL_FS_DIR}/var" "${ROOT_FS_DIR}/var"
   sudo mkdir -p "${ROOT_FS_DIR}/dev"
 
   # We "emerge --root=${ROOT_FS_DIR} --root-deps=rdeps --usepkgonly" all of the
   # runtime packages for chrome os. This builds up a chrome os image from
   # binary packages with runtime dependencies only.  We use INSTALL_MASK to
   # trim the image size as much as possible.
   sudo USE="${EXTRA_USE}" INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \

[davidjames, 2011/04/05 20:09:43]

Strictly speaking this doesn't need USE flags but might as well set it here.

And again, let's use sudo -E

     --root="${ROOT_FS_DIR}" --root-deps=rdeps \
     --usepkgonly chromeos ${EXTRA_PACKAGES} ${EMERGE_JOBS}
 
   # Set /etc/lsb-release on the image.
   "${OVERLAY_CHROMEOS_DIR}/scripts/cros_set_lsb_release" \
     --root="${ROOT_FS_DIR}" \
     --board="${BOARD}"
 
   # Populates the root filesystem with legacy bootloader templates
   # appropriate for the platform.  The autoupdater and installer will
@@ skipping 159 matching lines @@
   echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
 fi
 
 print_time_elapsed
 
 echo "To copy to USB keyfob, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX"
 echo "To convert to VMWare image, INSIDE the chroot, do something like:"
 echo "  ./image_to_vm.sh --from=${OUTSIDE_OUTPUT_DIR} --board=${BOARD}"
 echo "from the scripts directory where you entered the chroot."