aboutsummaryrefslogtreecommitdiff
path: root/util/abuild
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-03-30 15:49:14 +0000
committerStefan Reinauer <stepan@openbios.org>2010-03-30 15:49:14 +0000
commit0ed0b7cfe819ffcf0a1c305deb63b6ea8ace78bb (patch)
tree918a637bbe29c95ef6c014147118de1526bb8d96 /util/abuild
parentabdf84884e7ffa5335c6534a6198a38812ff51a4 (diff)
abuild:
it seems make oldconfig is not safe for parallel compilation. The problem never occured in my tests, but go back to non-parallel build again. Also pass on the return value of make oldconfig correctly. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5329 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/abuild')
-rwxr-xr-xutil/abuild/abuild7
1 files changed, 6 insertions, 1 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 7f0e2ed6db..7d4c9bb4cb 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -204,7 +204,8 @@ function create_config
fi
fi
- yes "" | $MAKE oldconfig -j $cpus obj=${build_dir} > ${build_dir}/config.log
+ #yes "" | $MAKE oldconfig -j $cpus obj=${build_dir} &> ${build_dir}/config.log
+ yes "" | $MAKE oldconfig obj=${build_dir} &> ${build_dir}/config.log
ret=$?
mv .config.old $TARGET/${VENDOR}_${MAINBOARD}/config.in
if [ $ret -eq 0 ]; then
@@ -233,7 +234,9 @@ function create_buildenv
VENDOR=$1
MAINBOARD=$2
CONFIG=$3
+
create_config $VENDOR $MAINBOARD $CONFIG
+ ret=$?
# Allow simple "make" in the target directory
MAKEFILE=$TARGET/${VENDOR}_${MAINBOARD}/Makefile
@@ -244,6 +247,8 @@ function create_buildenv
echo " cp config.build \$(TOP)/.config" >> $MAKEFILE
echo " cd \$(TOP); \$(MAKE) oldconfig obj=\$(OUT)" >> $MAKEFILE
echo " cd \$(TOP); \$(MAKE) obj=\$(OUT)" >> $MAKEFILE
+
+ return $ret
}
function compile_target