mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 06:01:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

*: use cros_workon not cros_list_modified_pkgs

Browse Source 
This removes a dependency on chromite
This commit is contained in:
Andrew Jeddeloh 2018-05-24 14:53:19 -07:00
parent 935466b68d
commit a27b02bcb6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_packages
View File

@ -86,8 +86,6 @@ fi
check_gsutil_opts check_gsutil_opts
CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
# Before we can run any tools, we need to update chroot or setup_board. # Before we can run any tools, we need to update chroot or setup_board.
UPDATE_ARGS=( --regen_configs ) UPDATE_ARGS=( --regen_configs )
if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
@ -170,8 +168,7 @@ fi
# Build cros_workon packages when they are changed. # Build cros_workon packages when they are changed.
CROS_WORKON_PKGS=() CROS_WORKON_PKGS=()
if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
LIST_MODIFIED_PACKAGES="${CHROMITE_BIN}/cros_list_modified_packages" CROS_WORKON_PKGS+=( $(cros_workon list --board=${FLAGS_board}) )
CROS_WORKON_PKGS+=( $("${LIST_MODIFIED_PACKAGES}" --board=${FLAGS_board}) )
fi fi
if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then

3
update_chroot
View File

@ -227,9 +227,8 @@ if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_FALSE}" && \
fi fi
# Build cros_workon packages when they are changed. # Build cros_workon packages when they are changed.
CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then 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}" ) EMERGE_FLAGS+=( "--reinstall-atoms=${pkg}" "--usepkg-exclude=${pkg}" )
done done
fi fi