Simplify ./build module routines

4 files changed, 17 insertions, 44 deletions

diff --git a/resources/scripts/helpers/build/module/coreboot b/resources/scripts/helpers/build/module/coreboot
index 756ca1c..cfca253 100755
--- a/resources/scripts/helpers/build/module/coreboot
+++ b/resources/scripts/helpers/build/module/coreboot
@@ -20,7 +20,7 @@
 #
 
 # This script assumes that the working directory is the root
-# of libreboot_src or git
+# of git or release archive
 
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
@@ -30,20 +30,11 @@ set -u -e
 
 printf "Building the utilities in coreboot\n"
 
-cd "coreboot/"
+# crossgcc
+# coreboot is 32-bit, so only build for i386
+make -j$(nproc) -BC coreboot crossgcc-i386
 
-# -----------------------------------------
-# Build the utilities required by libreboot
-# -----------------------------------------
-
-# cbfstool
-cd "util/cbfstool/"
-make -j"$(nproc)"
-
-# done. go back to coreboot dir
-cd "../../"
-
-# done. go back to main libreboot_src directory
-cd "../"
-
-printf "\n\n"
+# cbfstool, ifdtool, cbmem, nvramtool
+for util in {cbfs,ifd,nvram}tool cbmem; do
+   make -j$(nproc) -BC coreboot/util/${util}
+done
diff --git a/resources/scripts/helpers/build/module/flashrom b/resources/scripts/helpers/build/module/flashrom
index c4cb380..920b77d 100755
--- a/resources/scripts/helpers/build/module/flashrom
+++ b/resources/scripts/helpers/build/module/flashrom
@@ -20,12 +20,12 @@
 #
 
 # This script assumes that the working directory is the root
-# of libreboot_src or git
+# of git or release archive
 
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-# Build "flashrom" (utility for flashing/dumping ROM's)
+# Build "flashrom" (utility for flashing/dumping ROMs)
 # --------------------------------------------------------------------
 
 printf "Building flashrom\n"
@@ -80,5 +80,3 @@ done
 mv "flashrom_normal" "flashrom"
 
 cd "../"
-
-printf "\n\n"
diff --git a/resources/scripts/helpers/build/module/grub b/resources/scripts/helpers/build/module/grub
index 47589d5..030dd95 100755
--- a/resources/scripts/helpers/build/module/grub
+++ b/resources/scripts/helpers/build/module/grub
@@ -20,12 +20,12 @@
 #
 
 # This script assumes that the working directory is the root
-# of libreboot_src or git
+# of git or release archive
 
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-# Build utilies needed for building GRUB payloads
+# Build GRUB as coreboot payload
 # ---------------------------------------------------------------------
 
 printf "Building GRUB\n"
@@ -33,14 +33,9 @@ printf "Building GRUB\n"
 cd "grub/"
 
 # clean it first
-[ -f Makefile ] && make distclean
+make distclean
 
 # build grub
 ./autogen.sh
 ./configure --with-platform=coreboot
-make -j"$(nproc)"
-
-printf "\n\n"
-
-# done. go back to main directory
-cd "../"
+make -j$(nproc)
diff --git a/resources/scripts/helpers/build/module/memtest86plus b/resources/scripts/helpers/build/module/memtest86plus
index 772acf1..bcc7fbf 100755
--- a/resources/scripts/helpers/build/module/memtest86plus
+++ b/resources/scripts/helpers/build/module/memtest86plus
@@ -20,25 +20,14 @@
 #
 
 # This script assumes that the working directory is the root
-# of libreboot_src or git
+# of git or release archive
 
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-# Build MemTest86+ payload (for GRUB)
+# Build MemTest86+ payload
 # --------------------------------------------------------------------
 
 printf "Building MemTest86+\n"
 
-cd "memtest86plus/"
-
-# clean it first
-make clean
-
-# build memtest86+
-make -j"$(nproc)"
-
-# done. go back to main directory
-cd "../"
-
-printf "\n\n"
+make -j$(nproc) -BC memtest86plus