[coreboot] [v2] r4165 - trunk/coreboot-v2/util/abuild

[svn at coreboot.org]

Author: oxygene
Date: 2009-04-22 10:10:48 +0200 (Wed, 22 Apr 2009)
New Revision: 4165

Modified:
   trunk/coreboot-v2/util/abuild/abuild
Log:
Remove the requirement for payload.sh files to be executable. This
helps if the file is generated from patches, esp. if that happens
often (eg. with quilt)

Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>


Modified: trunk/coreboot-v2/util/abuild/abuild
===================================================================
--- trunk/coreboot-v2/util/abuild/abuild	2009-04-22 08:07:31 UTC (rev 4164)
+++ trunk/coreboot-v2/util/abuild/abuild	2009-04-22 08:10:48 UTC (rev 4165)
@@ -127,12 +127,12 @@
 
         # get a working payload for the board if we have one.
         # the --payload option expects a directory containing 
-	# an executable shell script payload.sh
+	# a shell script payload.sh
 	#   Usage: payload.sh [VENDOR] [DEVICE]
 	# the script returns an absolute path to the payload binary.
 
-	if [ -x $payloads/payload.sh ]; then
-		PAYLOAD=`$payloads/payload.sh $VENDOR $MAINBOARD`
+	if [ -f $payloads/payload.sh ]; then
+		PAYLOAD=`sh $payloads/payload.sh $VENDOR $MAINBOARD`
 		printf "Using payload $PAYLOAD\n"
 	fi