From 7ff25fd1932471a23827ef821be97fc4969910e1 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 24 Nov 2014 21:32:35 -0500
Subject: libreboot_bin.tar.xz: Include utils as statically linked binaries

This means that the user does not have to install build dependency
or build from source anymore.
---
(limited to 'x60flashfrom5')

diff --git a/x60flashfrom5 b/x60flashfrom5
index 5276615..268c9c0 100755
--- a/x60flashfrom5
+++ b/x60flashfrom5
@@ -22,6 +22,19 @@
 # set -u -e -v
 set -v
 
+if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]
+	then
+		echo "Running on i686. ok."
+		sleep 5
+elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]
+	then
+		echo "Running on x86_64. ok."
+		sleep 5
+else
+	echo "This script must be run on an i686 or x86_64 host. x86_64 is recommended."
+	exit 1
+fi
+
 if [[ $EUID -ne 0 ]]; then
    echo "This script must be run as root" 
    exit 1
@@ -44,5 +57,16 @@ fi
 # boardmismatch=force is for people upgrading from libreboot 5th release, where the new ROM's are "ThinkPad X60 / X60s / X60t"
 # and the old ones are "ThinkPad X60 / X60s" and flashrom complains otherwise
 
-./flashrom/flashrom -p internal:boardmismatch=force -w $1
+if [ -f "DEBLOB" ]; then
+	# Means we are in src archive or git
+	./flashrom/flashrom -p internal:boardmismatch=force -w $1
+elif [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]
+	then
+		# Means we are in bin archive and on an i686 host
+		./flashrom/i686/flashrom -p internal:boardmismatch=force -w $1
+elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]
+	then
+		# Means we are in bin archive and on an x86_64 host
+		./flashrom/x86_64/flashrom -p internal:boardmismatch=force -w $1
+fi
 
--
cgit v0.9.1