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

Merge pull request #143 from kinvolk/krnowak/use-internal-cros-workon

Browse Source 
*: Use the internal copy of cros_workon
This commit is contained in:
Krzesimir Nowak 2021-08-27 14:18:59 +02:00 committed by GitHub
commit d67a8f04dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_packages
View File

@ -166,7 +166,7 @@ fi
# Build cros_workon packages when they are changed.
CROS_WORKON_PKGS=()
if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
CROS_WORKON_PKGS+=( $(cros_workon list --board=${FLAGS_board}) )
CROS_WORKON_PKGS+=( $("${SRC_ROOT}/scripts/cros_workon" list --board=${FLAGS_board}) )
fi
if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then

4
setup_board
View File

@ -98,7 +98,7 @@ generate_all_wrappers() {
wrapper="/usr/local/bin/cros_workon-${BOARD_VARIANT}"
sudo_clobber "${wrapper}" <<EOF
#!/bin/bash
exec cros_workon --board ${BOARD_VARIANT} "\$@"
exec "${SRC_ROOT}/scripts/cros_workon" --board ${BOARD_VARIANT} "\$@"
EOF
wrappers+=( "${wrapper}" )
@ -346,7 +346,7 @@ info "The SYSROOT is: ${BOARD_ROOT}"
# NOTE: Printing the working-on ebuilds does not only serve the informative
# purpose. It also causes the ${BOARD_ROOT}/etc/portage/package.* files to be
# regenerated.
WORKING_ON=$(cros_workon --board=${FLAGS_board} list)
WORKING_ON=$("${SRC_ROOT}/scripts/cros_workon" --board=${FLAGS_board} list)
if [ -n "${WORKING_ON}" ]; then
info
info "Currently working on the following ebuilds for this board:"

2
update_chroot
View File

@ -231,7 +231,7 @@ fi
# Build cros_workon packages when they are changed.
if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
for pkg in $(cros_workon list --host); do
for pkg in $("${SRC_ROOT}/scripts/cros_workon" list --host); do
EMERGE_FLAGS+=( "--reinstall-atoms=${pkg}" "--usepkg-exclude=${pkg}" )
done
fi