aboutsummaryrefslogtreecommitdiff
path: root/resources/scripts/helpers
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-03-10 18:42:14 +0000
committerFrancis Rowe <info@gluglug.org.uk>2016-03-10 18:42:14 +0000
commitf1cc58c58a29e6183f6300c99e1f113edcecffe8 (patch)
tree8fd04a50c590b71a1d5a22a10a182bd712d7b306 /resources/scripts/helpers
parent4120c8a2f626134fda30390c5f39661379c4a1a2 (diff)
downloadlibrebootfr-f1cc58c58a29e6183f6300c99e1f113edcecffe8.tar.gz
librebootfr-f1cc58c58a29e6183f6300c99e1f113edcecffe8.zip
build scripts: use $(nproc) not "$(nproc)" for make -j option
Diffstat (limited to 'resources/scripts/helpers')
-rwxr-xr-xresources/scripts/helpers/build/module/bucts2
-rwxr-xr-xresources/scripts/helpers/build/module/flashrom12
-rwxr-xr-xresources/scripts/helpers/build/roms/withdepthcharge6
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub_helper2
4 files changed, 11 insertions, 11 deletions
diff --git a/resources/scripts/helpers/build/module/bucts b/resources/scripts/helpers/build/module/bucts
index e0114842..6e54fc1b 100755
--- a/resources/scripts/helpers/build/module/bucts
+++ b/resources/scripts/helpers/build/module/bucts
@@ -44,7 +44,7 @@ if [ "${buildtype}" = "static" ]; then
fi
make clean
-make -j"$(nproc)"
+make -j$(nproc)
if [ "${buildtype}" = "static" ]; then
patch "Makefile" -R < "../resources/bucts/patch/staticlink.diff"
diff --git a/resources/scripts/helpers/build/module/flashrom b/resources/scripts/helpers/build/module/flashrom
index 920b77dc..3664f565 100755
--- a/resources/scripts/helpers/build/module/flashrom
+++ b/resources/scripts/helpers/build/module/flashrom
@@ -34,12 +34,12 @@ cd "flashrom/"
make clean
if (( $# != 1 )); then
- make -j"$(nproc)"
+ make -j$(nproc)
else
if [ "${1}" = "static" ]; then
- make SHARED=0 CC='gcc -static' -j"$(nproc)"
+ make SHARED=0 CC='gcc -static' -j$(nproc)
else
- make -j"$(nproc)"
+ make -j$(nproc)
fi
fi
@@ -60,12 +60,12 @@ do
make clean
if (( $# != 1 )); then
- make -j"$(nproc)"
+ make -j$(nproc)
else
if [ "${1}" = "static" ]; then
- make SHARED=0 CC='gcc -static' -j"$(nproc)"
+ make SHARED=0 CC='gcc -static' -j$(nproc)
else
- make -j"$(nproc)"
+ make -j$(nproc)
fi
fi
diff --git a/resources/scripts/helpers/build/roms/withdepthcharge b/resources/scripts/helpers/build/roms/withdepthcharge
index 2ba97766..eaab8f04 100755
--- a/resources/scripts/helpers/build/roms/withdepthcharge
+++ b/resources/scripts/helpers/build/roms/withdepthcharge
@@ -63,7 +63,7 @@ buildlibpayload() {
rm -Rf "install/"
make KBUILD_DEFCONFIG="configs/config.$family" defconfig
- make -j"$(nproc)"
+ make -j$(nproc)
make DESTDIR="install" install
cd "../../"
@@ -94,7 +94,7 @@ builddepthcharge() {
rm -f "../coreboot/${cbrevision:?}/${cbrevision:?}/depthcharge.elf"
make BOARD="${board}" defconfig
- make BOARD="${board}" LIBPAYLOAD_DIR="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/payloads/libpayload/install/libpayload" VB_SOURCE="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/3rdparty/vboot" -j"$(nproc)" depthcharge_unified
+ make BOARD="${board}" LIBPAYLOAD_DIR="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/payloads/libpayload/install/libpayload" VB_SOURCE="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/3rdparty/vboot" -j$(nproc) depthcharge_unified
cp "build/depthcharge.elf" "../coreboot/${cbrevision}/${cbrevision}/"
@@ -129,7 +129,7 @@ buildcoreboot() {
printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot
make KBUILD_DEFCONFIG="$(pwd)/../../../resources/libreboot/config/depthcharge/${board}/config" defconfig
- make -j"$(nproc)"
+ make -j$(nproc)
cbfs_size=$( grep CONFIG_CBFS_SIZE ".config" | sed "s/.*[[:space:]]*=[[:space:]]*//g" )
cbfs_size=$( printf "%d\n" "${cbfs_size}" )
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index 047aa763..bd1af190 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -98,7 +98,7 @@ do
make clean
mv "config_${romtype}" ".config"
cp "../../grub_${romtype}.elf" "grub.elf"
- make -j"$(nproc)"
+ make -j$(nproc)
rm -f "grub.elf"
mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom"
# .config no longer needed