[coreboot-gerrit] Patch set updated for coreboot: buildgcc: Search the cksum command without checking OS type

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/11483

-gerrit

commit 8c810c5d284ee626cf06e3c3cdf9905b82244852
Author: zbao <fishbaozi at gmail.com>
Date:   Tue Sep 1 22:28:57 2015 -0400

    buildgcc: Search the cksum command without checking OS type
    
    The checksum command might appear to be unpredictable only by
    checking the OS. Just list the candidates, sorted by possibility.
    
    Change-Id: Ia3f4f5f0f98ff47d322a4f70689cca0bd4fa79fa
    Signed-off-by: Zheng Bao <zheng.bao at amd.com>
    Signed-off-by: Zheng Bao <fishbaozi at gmail.com>
---
 util/crossgcc/buildgcc | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 5bfd383..d858919 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -165,24 +165,26 @@ searchtool()
 			fi
 		fi
 	fi
-	if [ "$(echo $1 | cut -b -3)" = "sha" ]; then
-		if [ $UNAME = "FreeBSD" ]; then
-			if [ -x "$(which sha1 2>/dev/null)" ]; then
-				echo sha1
-				return
-			fi
-		fi
-		if [ $UNAME = "NetBSD" ]; then
-			if [ -x "$(which cksum 2>/dev/null)" ]; then
-				echo cksum -a $(echo $1 | sed -e 's,sum,,')
-				return
-			fi
-		fi
-		if [ $UNAME = "Darwin" ]; then
-			if [ -x "$(which openssl 2>/dev/null)" ]; then
-				echo openssl $(echo $1 | sed -e 's,sum,,')
-				return
-			fi
+	if echo $1 | grep -q "sum" ; then
+		algor=$(echo $1 | sed -e 's,sum,,')
+		if [ -x "$(which $1 2>/dev/null)" ]; then
+			#xxxsum [file]
+			echo $1
+			return
+		elif [ -x "$(which $algor 2>/dev/null)" ]; then
+			#xxx [file]
+			echo $algor
+			return
+		elif [ -x "$(which openssl 2>/dev/null)" ]; then
+			#openssl xxx [file]
+			echo openssl $algor
+			return
+		elif [ -x "$(which cksum 2>/dev/null)" ]; then
+			#cksum -a xxx [file]
+			#cksum has special options in NetBSD. Actually, NetBSD will use the second case above.
+			echo "buildgcc" | cksum -a $algor > /dev/null 2>/dev/null && \
+			echo cksum -a $algor
+			return
 		fi
 	fi
 
@@ -790,7 +792,8 @@ TAR=$(searchtool tar) || exit $?
 PATCH=$(searchtool patch) || exit $?
 MAKE=$(searchtool make) || exit $?
 SHA1SUM=$(searchtool sha1sum)
-SHA512SUM=$(searchtool sha512sum)
+#SHA512SUM=$(searchtool sha512sum)
+#MD5SUM=$(searchtool md5sum)
 CHECKSUM=$SHA1SUM
 LBZIP2=$(searchtool lbzip2 "" nofail)
 PIGZ=$(searchtool pigz "" nofail)