diff --git a/src/new_build.sh b/src/new_build.sh index cb365dcf..90a2ed93 100755 --- a/src/new_build.sh +++ b/src/new_build.sh @@ -32,6 +32,7 @@ # For each device in `$DEVICE_LIST` # - setup subdirectories # - `repo init` +# - Delete ./vendor # - `repo sync` # - setup our overlays # - Add custom packages to be installed @@ -169,6 +170,7 @@ if [ "$INCLUDE_PROPRIETARY" = true ]; then "https://gitlab.com/the-muppets/manifest/raw/$themuppets_branch/muppets.xml" .repo/local_manifests/proprietary_gitlab.xml fi + # Sync mirror if we're using one if [ "$LOCAL_MIRROR" = true ]; then @@ -226,6 +228,10 @@ for codename in ${devices//,/ }; do # `repo sync` if [ "$CALL_REPO_SYNC" = true ]; then echo ">> [$(date)] Syncing branch repository" | tee -a "$repo_log" + + # Delete ./vendor + rm -rf vendor || true + repo sync "${jobs_arg[@]}" "${retry_fetches_arg[@]}" --current-branch --force-sync &>> "$repo_log" else echo ">> [$(date)] Syncing branch repository disabled" | tee -a "$repo_log"