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

workaround make bugs

Browse Source
This commit is contained in:
Bryan Roessler
2024-05-21 17:56:23 -04:00
parent 8bea538b1f
commit 78820d1058
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
openwrtbuilder
View File

@@ -582,13 +582,20 @@ fromSource() {
wt_commit="$RELEASE" wt_commit="$RELEASE"
;; ;;
esac esac
if [[ -d "$GITWORKTREEDIR" ]]; then
execute git -C "$GITWORKTREEDIR" checkout "$wt_commit" # TODO There's a bug in the make clean functions that seem to invoke a full make
execute git -C "$GITWORKTREEDIR" pull # if [[ -d "$GITWORKTREEDIR" ]]; then
else # execute git -C "$GITWORKTREEDIR" checkout "$wt_commit"
execute git -C "$GITSRCDIR" worktree add --force --detach "$GITWORKTREEDIR" "$wt_commit" # execute git -C "$GITWORKTREEDIR" pull
fi # else
# execute git -C "$GITSRCDIR" worktree add --force --detach "$GITWORKTREEDIR" "$wt_commit"
# fi
# To workaround bug, don't use make *clean, blow it away and start fresh
[[ -d "$GITWORKTREEDIR" ]] && execute rm -rf "$GITWORKTREEDIR"
execute git -C "$GITSRCDIR" worktree add --force --detach "$GITWORKTREEDIR" "$wt_commit"
# Print commit information # Print commit information
commit=$(git -C "$GITWORKTREEDIR" rev-parse HEAD) commit=$(git -C "$GITWORKTREEDIR" rev-parse HEAD)
@@ -670,7 +677,7 @@ fromSource() {
# Make prep # Make prep
(( DEBUG )) && make_opts+=("V=s") (( DEBUG )) && make_opts+=("V=s")
execute make "${make_opts[@]}" "-j1" targetclean # TODO 'dirclean' has a bug that triggers menuconfig #execute make "${make_opts[@]}" "-j1" dirclean # TODO 'dirclean' has a bug that triggers menuconfig
execute make "${make_opts[@]}" "-j1" defconfig execute make "${make_opts[@]}" "-j1" defconfig
execute make "${make_opts[@]}" "-j1" download execute make "${make_opts[@]}" "-j1" download