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

Simplify make

Browse Source
This commit is contained in:
Bryan Roessler
2024-05-21 17:05:13 -04:00
parent b2f2d34b27
commit 4d721f43c1
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openwrtbuilder
View File

@@ -589,7 +589,7 @@ fromSource() {
;; ;;
esac esac
[[ -d "$GITWORKTREEDIR" ]] && rm -rf "$GITWORKTREEDIR" # overwrite worktree changes [[ -d "$GITWORKTREEDIR" ]] && execute rm -rf "$GITWORKTREEDIR" # overwrite worktree changes
execute "${wt_cmd[@]}" "$wt_commit" execute "${wt_cmd[@]}" "$wt_commit"
@@ -673,15 +673,12 @@ fromSource() {
# Make prep # Make prep
(( DEBUG )) && make_opts+=("V=s") (( DEBUG )) && make_opts+=("V=s")
execute make "${make_opts[@]}" "-j1" targetclean defconfig download execute make "${make_opts[@]}" "-j1" dirclean defconfig download
# Make image # Make image
if ! execute ionice -c 3 chrt --idle 0 nice -n19 make "${make_opts[@]}" "-j$(($(nproc)+1))" world; then if ! execute ionice -c 3 chrt --idle 0 nice -n19 make "${make_opts[@]}" "-j$(($(nproc)+1))" world; then
echo "Error: make failed, retrying using slow mode" echo "Error: make failed"
if ! execute make V=s -j1 dirclean world; then return 1
echo "Error: slow make failed"
return 1
fi
fi fi
popd || return 1 popd || return 1