commit 0206e1b50738a8340864da7a73ee833b65fa3f62
author Gregory Meinke <gmeinke@chromium.org> Mon Aug 27 13:53:23 2018 -0600
committer chrome-bot <chrome-bot@chromium.org> Thu Aug 30 01:27:57 2018 -0700
tree 96f2188909688126e1fa36d52fe9eacd42d59f1c
parent 13d2973ccebd6a7e7387b7714a07c70000dc7a09

remove install plan from build scripts

Remove the flags for saving the emerge install plan from build scripts.
Saving this incorrect data to an intermediate file is no longer
necessary since the new reverse dependency calculation code is already
submitted.

BUG=chromium:864309
TEST=local builds and tryjobs
CQ-DEPEND=CL:1190424

Change-Id: I405400bbdef0d8c88b4877eb1fab38dea5af8217
Reviewed-on: https://chromium-review.googlesource.com/1191762
Commit-Ready: Gregory Meinke <gmeinke@chromium.org>
Tested-by: Gregory Meinke <gmeinke@chromium.org>
Reviewed-by: Gregory Meinke <gmeinke@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

build_packages

diff --git a/build_packages b/build_packages
index 4fd060e..b824167 100755
--- a/build_packages
+++ b/build_packages
@@ -36,9 +36,6 @@
   "Define the file that event logs will be written."
 DEFINE_boolean withrevdeps "${FLAGS_TRUE}" \
   "Calculate reverse dependencies on changed ebuilds."
-# Temporarily keep this flag until removed from rest of build system.
-DEFINE_string save_install_plan "" \
-  "Save install plan filename for correct reverse dependency calculation."
 
 # The --board_root flag specifies the environment variables ROOT and PKGDIR.
 # This allows fetching and emerging of all packages to specified board_root.

setup_board

diff --git a/setup_board b/setup_board
index f403188..419fc8f 100755
--- a/setup_board
+++ b/setup_board
@@ -61,8 +61,6 @@
   "Don't emerge any packages during setup_board into the board root."
 DEFINE_string board_root "" \
   "Board root."
-DEFINE_string save_install_plan "" \
-  "Save install plan to filename for correct reverse dependency calculation."
 
 # The --reuse_pkgs_from_local_boards flag tells Portage to share binary
 # packages between boards that are built locally, so that the total time
@@ -99,11 +97,6 @@
 if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_TRUE}" ]]; then
   UPDATE_ARGS+=" --skip_toolchain_update"
 fi
-if [[ ! -z "${FLAGS_save_install_plan}" ]]; then
-  # If we are trying to calculate reverse dependencies pass the install
-  # plan filename to update_chroot.
-  UPDATE_ARGS+=" --save_install_plan=${FLAGS_save_install_plan}"
-fi
 
 if [ "${FLAGS_skip_chroot_upgrade}" -eq "${FLAGS_FALSE}" ] ; then
   "${SRC_ROOT}/scripts"/update_chroot ${UPDATE_ARGS}

update_chroot

diff --git a/update_chroot b/update_chroot
index 00ba389..19ddadd 100755
--- a/update_chroot
+++ b/update_chroot
@@ -34,8 +34,6 @@
   "Extra toolchains to setup for the specified boards."
 DEFINE_boolean eclean ${FLAGS_TRUE} \
   "Run eclean to delete old binpkgs after updating the chroot."
-DEFINE_string save_install_plan "" \
-  "Save install plan to filename for correct reverse dependency calculation."
 
 # Parse command line flags
 FLAGS "$@" || exit 1
@@ -116,12 +114,6 @@
     $(printf ' --useoldpkg-atoms=%s' "${PACKAGES[@]}")
   )
 fi
-SAVE_INSTALL_PLAN_FLAGS=()
-if [[ ! -z "${FLAGS_save_install_plan}" ]]; then
-  SAVE_INSTALL_PLAN_FLAGS=(
-    $(printf ' --install-plan-filename=%s' "${FLAGS_save_install_plan}") )
-  EMERGE_FLAGS+=( ${SAVE_INSTALL_PLAN_FLAGS[@]} )
-fi
 if [[ "${FLAGS_jobs}" -ne -1 ]]; then
   EMERGE_FLAGS+=( --jobs="${FLAGS_jobs}" )
 fi
@@ -142,7 +134,6 @@
   EMERGE_FLAGS+=(
     $("${CHROMITE_BIN}/cros_setup_toolchains" --show-packages host-post-cross)
   )
-  EMERGE_FLAGS+=( ${SAVE_INSTALL_PLAN_FLAGS[@]} )
   sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}"
 fi