commit 40e1be3ba7057bbc36d936036e335cc97ec99ace
author Ram Chandrasekar <rchandrasekar@google.com> Wed Jul 13 18:02:33 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 20 08:04:03 2022 +0000
tree 0c420b495262317c7c8e697b8443d81f6df82ab3
parent 73aeb79b6474ce82ebd310ec6dd86cd4ee39eb0d

build_image: remove moving images and installing DLC images

Moving the newly built images to output directory and installing DLC
images are done in python. Hence remove them in shell script.

BUG=b:238796659
TEST=CQ

Cq-Depend: chromium:3760100
Change-Id: I74a409b52b317a50eafb403f6dc2ca34b6a3ed5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/3760902
Reviewed-by: Cindy Lin <xcl@google.com>
Commit-Queue: Ram Chandrasekar <rchandrasekar@google.com>
Tested-by: Ram Chandrasekar <rchandrasekar@google.com>

build_image.sh

diff --git a/build_image.sh b/build_image.sh
index a82185d..78e0949 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -41,8 +41,6 @@
 DEFINE_boolean enable_rootfs_verification ${FLAGS_TRUE} \
   "Default all bootloaders to use kernel-based root fs integrity checking." \
   r
-DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images" \
-  "Directory in which to place image result directories (named by version)"
 DEFINE_string disk_layout "default" \
   "The disk layout type to use for this image."
 DEFINE_string enable_serial "" \
@@ -82,20 +80,8 @@
 # The following options are advanced options, only available to those willing
 # to read the source code. They are not shown in help output, since they are
 # not needed for the typical developer workflow.
-DEFINE_integer build_attempt 1 \
-  "The build attempt for this image build."
-DEFINE_string build_root "${DEFAULT_BUILD_ROOT}/images" \
-  "Directory in which to compose the image, before copying it to output_root."
 DEFINE_integer jobs -1 \
   "How many packages to build in parallel at maximum."
-DEFINE_boolean replace ${FLAGS_FALSE} \
-  "Overwrite existing output, if any."
-DEFINE_string symlink "latest" \
-  "Symlink name to use for this image."
-DEFINE_string version "" \
-  "Overrides version number in name to this version."
-DEFINE_string output_suffix "" \
-  "Add custom suffix to output directory."
 
 # Parse command line.
 FLAGS "$@" || exit 1
@@ -155,34 +141,12 @@
   mod_image_for_test  "${CHROMEOS_TEST_IMAGE_NAME}"
 fi
 
-# Move the completed image to the output_root.
-move_image "${BUILD_DIR}" "${OUTPUT_DIR}"
-
-# Copy DLC images to the output_root directory.
-info_run build_dlc \
-  --sysroot="${BOARD_ROOT}" \
-  --install-root-dir="${OUTPUT_DIR}/dlc" \
-  --board="${BOARD}"
-
-# Create a named symlink.
-LINK_NAME="${FLAGS_output_root}/${BOARD}/${FLAGS_symlink}"
-ln -sfT "$(basename "${OUTPUT_DIR}")" "${LINK_NAME}"
-
-info "Done. Image(s) created in ${OUTPUT_DIR}"
 echo
 
 # Print out the images we generated.
 summarize() {
   local name="$1" img="$2"
-  local dir_path
-
-  # __flags_output_root_default defined in shflags.
-  # shellcheck disable=2154
-  if [[ "${FLAGS_output_root}" == "${__flags_output_root_default}" ]]; then
-    dir_path=${OUTSIDE_OUTPUT_DIR}
-  else
-    dir_path="${OUTPUT_DIR}"
-  fi
+  local dir_path="${OUTPUT_DIR}"
 
   info "${name} image created as ${img}"
   info "To copy the image to a USB key, use:"