bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use git fetch for branches

Browse Source
This commit is contained in:
Bryan Roessler
2025-07-28 19:00:44 -04:00
parent 4b66de068b
commit ca3f1e82ed
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openwrtbuilder
View File

@@ -508,6 +508,8 @@ from_source() {
tag="v$RELEASE" tag="v$RELEASE"
if ask_ok "Use $branch branch HEAD (y, recommended) or $tag tag (n)?"; then if ask_ok "Use $branch branch HEAD (y, recommended) or $tag tag (n)?"; then
wt_commit="$branch" wt_commit="$branch"
# Always fetch latest branch from origin
execute git -C "$SRC_DIR" fetch origin "$branch:$branch"
else else
wt_commit="$tag" wt_commit="$tag"
fi fi
@@ -515,6 +517,10 @@ from_source() {
*) *)
debug "Passing '$RELEASE' commit-ish to git worktree" debug "Passing '$RELEASE' commit-ish to git worktree"
wt_commit="$RELEASE" wt_commit="$RELEASE"
# If it's a branch, fetch latest
if execute git -C "$SRC_DIR" show-ref --verify --quiet "refs/heads/$wt_commit"; then
execute git -C "$SRC_DIR" fetch origin "$wt_commit:$wt_commit"
fi
;; ;;
esac esac
@@ -552,6 +558,7 @@ from_source() {
# Enter worktree # Enter worktree
execute pushd "$WORKTREE_DIR" || return 1 execute pushd "$WORKTREE_DIR" || return 1
# Begin OpenWRT build process
((DEBUG)) && make_opts+=("V=sc") ((DEBUG)) && make_opts+=("V=sc")
# Cleanup build environment # Cleanup build environment
@@ -618,11 +625,12 @@ from_source() {
echo "$config" >> "$seed_file" echo "$config" >> "$seed_file"
done done
# Make prep # Serial make prep is more reliable
execute make "${make_opts[@]}" "-j1" defconfig execute make "${make_opts[@]}" "-j1" defconfig
execute make "${make_opts[@]}" "-j1" download execute make "${make_opts[@]}" "-j1" download
((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-1))")
# make_opts+=("-j$(($(nproc)-1))") # make_opts+=("-j$(($(nproc)-1))")
((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-1))")
# Make image # Make image
if ! execute ionice -c 3 chrt --idle 0 nice -n19 make "${make_opts[@]}" world; then if ! execute ionice -c 3 chrt --idle 0 nice -n19 make "${make_opts[@]}" world; then