Install target packages after repo update
This commit is contained in:
@@ -244,6 +244,18 @@ EOF
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
install_bootstrap_packages() {
|
||||||
|
has_cmd apt-get || return 0
|
||||||
|
has_cmd git && return 0
|
||||||
|
|
||||||
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
if ubuntu_sources_need_repair; then
|
||||||
|
repair_ubuntu_sources
|
||||||
|
fi
|
||||||
|
sudo_cmd apt-get update
|
||||||
|
sudo_cmd apt-get install -y ca-certificates git
|
||||||
|
}
|
||||||
|
|
||||||
ensure_repo() {
|
ensure_repo() {
|
||||||
WORKDIR="$(prompt "Repository directory" "$WORKDIR")"
|
WORKDIR="$(prompt "Repository directory" "$WORKDIR")"
|
||||||
JOBS="$(prompt "Parallel build jobs" "$JOBS")"
|
JOBS="$(prompt "Parallel build jobs" "$JOBS")"
|
||||||
@@ -437,8 +449,9 @@ show_completion() {
|
|||||||
main() {
|
main() {
|
||||||
select_target
|
select_target
|
||||||
progress 5 "Selected target: $MENU_CHOICE"
|
progress 5 "Selected target: $MENU_CHOICE"
|
||||||
run_step 15 "Installing required Ubuntu packages" install_packages
|
run_step 10 "Installing bootstrap Ubuntu packages" install_bootstrap_packages
|
||||||
ensure_repo
|
ensure_repo
|
||||||
|
run_step 40 "Installing required Ubuntu packages" install_packages
|
||||||
build_selected
|
build_selected
|
||||||
show_completion
|
show_completion
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ The script clones the Agrarian repository if the selected checkout directory
|
|||||||
does not exist. If the checkout already exists, it fetches, checks out the
|
does not exist. If the checkout already exists, it fetches, checks out the
|
||||||
configured branch, and performs a fast-forward pull.
|
configured branch, and performs a fast-forward pull.
|
||||||
|
|
||||||
|
Only bootstrap packages needed to update the checkout are installed before the
|
||||||
|
pull. Target-specific packages are installed after the checkout is current, so
|
||||||
|
fresh dependency fixes on the selected branch are applied before the build.
|
||||||
|
|
||||||
Quick Start
|
Quick Start
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user