aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlemens Nanni <contact@autoboot.org>2016-03-08 18:19:37 +0100
committerFrancis Rowe <info@gluglug.org.uk>2016-03-10 19:01:29 +0000
commite69d207f428b3fabfee69778368a6c13f1aefede (patch)
tree3b1d9c9e7acb931b6ef55549308db0a72ac70d70
parentf1cc58c58a29e6183f6300c99e1f113edcecffe8 (diff)
downloadlibrebootfr-e69d207f428b3fabfee69778368a6c13f1aefede.tar.gz
librebootfr-e69d207f428b3fabfee69778368a6c13f1aefede.zip
build/grub: Change wording, use a subshell
-rwxr-xr-xresources/scripts/helpers/build/module/grub16
1 files changed, 9 insertions, 7 deletions
diff --git a/resources/scripts/helpers/build/module/grub b/resources/scripts/helpers/build/module/grub
index e96b7e73..f899bc25 100755
--- a/resources/scripts/helpers/build/module/grub
+++ b/resources/scripts/helpers/build/module/grub
@@ -1,9 +1,9 @@
#!/bin/bash
-# helper script: builds GRUB source code
+# helper script: builds GRUB2 source code
#
# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
-# Copyright (C) 2015 Klemens Nanni <contact@autoboot.org>
+# Copyright (C) 2015, 2016 Klemens Nanni <contact@autoboot.org>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,17 +25,19 @@
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
-# Build GRUB as coreboot payload
-# ---------------------------------------------------------------------
+# Build GRUB2 as coreboot payload
printf "Building GRUB\n"
-cd "grub/"
+# use a subshell to not end up in grub/ in case of build issues
+(
+cd grub/
-# clean it first
+# clean up first
[ -d Makefile ] && make distclean
-# build grub
+# build
./autogen.sh
./configure --with-platform=coreboot
make -j$(nproc)
+)