From a27b02bcb631f0db2b165c8236f48ff8a91ee619 Mon Sep 17 00:00:00 2001
From: Andrew Jeddeloh <andrew.jeddeloh@coreos.com>
Date: Thu, 24 May 2018 14:53:19 -0700
Subject: [PATCH] *: use cros_workon not cros_list_modified_pkgs

This removes a dependency on chromite
---
 build_packages | 5 +----
 update_chroot  | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build_packages b/build_packages
index 412e4dfc1f..58949b9853 100755
--- a/build_packages
+++ b/build_packages
@@ -86,8 +86,6 @@ fi
 
 check_gsutil_opts
 
-CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
-
 # Before we can run any tools, we need to update chroot or setup_board.
 UPDATE_ARGS=( --regen_configs )
 if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
@@ -170,8 +168,7 @@ fi
 # Build cros_workon packages when they are changed.
 CROS_WORKON_PKGS=()
 if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
-  LIST_MODIFIED_PACKAGES="${CHROMITE_BIN}/cros_list_modified_packages"
-  CROS_WORKON_PKGS+=( $("${LIST_MODIFIED_PACKAGES}" --board=${FLAGS_board}) )
+  CROS_WORKON_PKGS+=( $(cros_workon list --board=${FLAGS_board}) )
 fi
 
 if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then
diff --git a/update_chroot b/update_chroot
index 85b703d3bd..870d599ef6 100755
--- a/update_chroot
+++ b/update_chroot
@@ -227,9 +227,8 @@ if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_FALSE}" && \
 fi
 
 # Build cros_workon packages when they are changed.
-CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
 if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
-  for pkg in $("${CHROMITE_BIN}/cros_list_modified_packages" --host); do
+  for pkg in $(cros_workon list --host); do
     EMERGE_FLAGS+=( "--reinstall-atoms=${pkg}" "--usepkg-exclude=${pkg}" )
   done
 fi