[coreboot] [commit] r5329 - trunk/util/abuild

[repository service]

Author: stepan
Date: Tue Mar 30 17:49:14 2010
New Revision: 5329
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5329

Log:
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 at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>

Modified:
   trunk/util/abuild/abuild

Modified: trunk/util/abuild/abuild
==============================================================================
--- trunk/util/abuild/abuild	Tue Mar 30 16:02:19 2010	(r5328)
+++ trunk/util/abuild/abuild	Tue Mar 30 17:49:14 2010	(r5329)
@@ -204,7 +204,8 @@
 		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 @@
 	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 @@
 	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