From 21db10f5cbf3d300f32c1adc2a497aa767c01ee4 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Wed, 23 Feb 2022 16:28:32 -0500
Subject: [PATCH] Revert breakout make download and count cpus

---
 openwrtbuilder | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/openwrtbuilder b/openwrtbuilder
index 5c846aa..e0e97a8 100755
--- a/openwrtbuilder
+++ b/openwrtbuilder
@@ -273,19 +273,9 @@ makeImage() {
 
     [[ ! -d "${P_ARR[out_bin_dir]}" ]] && mkdir -p "${P_ARR[out_bin_dir]}"
 
-    _numcpus=$(nproc)
-    _numcpus=$(( _numcpus - 1 ))
-
-    # download image
-    debug "make download BIN_DIR=${P_ARR[out_bin_dir]} PROFILE=${P_ARR[profile]} PACKAGES=${P_ARR[packages]} FILES=$FILESDIR --directory=${P_ARR[source_dir]} > make.log"
-    if ! make download BIN_DIR="${P_ARR[out_bin_dir]}" PROFILE="${P_ARR[profile]}" PACKAGES="${P_ARR[packages]}" FILES="$FILESDIR" --directory="${P_ARR[source_dir]}" > make.log; then
-        echo "Make download failed!"
-        exit 1
-    fi
-
     # build image
-    debug "make -j$_numcpus image BIN_DIR=${P_ARR[out_bin_dir]} PROFILE=${P_ARR[profile]} PACKAGES=${P_ARR[packages]} FILES=$FILESDIR --directory=${P_ARR[source_dir]} >> make.log"
-    if ! make -j$_numcpus image BIN_DIR="${P_ARR[out_bin_dir]}" PROFILE="${P_ARR[profile]}" PACKAGES="${P_ARR[packages]}" FILES="$FILESDIR" --directory="${P_ARR[source_dir]}" >> make.log; then
+    debug "make image BIN_DIR=${P_ARR[out_bin_dir]} PROFILE=${P_ARR[profile]} PACKAGES=${P_ARR[packages]} FILES=$FILESDIR --directory=${P_ARR[source_dir]} > make.log"
+    if ! make image BIN_DIR="${P_ARR[out_bin_dir]}" PROFILE="${P_ARR[profile]}" PACKAGES="${P_ARR[packages]}" FILES="$FILESDIR" --directory="${P_ARR[source_dir]}" > make.log; then
         echo "Make image failed!"
         exit 1
     fi