diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-11-25 02:32:35 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-11-25 03:26:53 +0000 |
| commit | 7ff25fd1932471a23827ef821be97fc4969910e1 (patch) | |
| tree | ee1fb3803d66cdd4d07209b7b273a1f1252bd6aa /x60flashfrom5 | |
| parent | 62d4eaaaf4b87629b37e6d16d4b4020499207d73 (diff) | |
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.
Diffstat (limited to 'x60flashfrom5')
| -rwxr-xr-x | x60flashfrom5 | 26 |
1 files changed, 25 insertions, 1 deletions
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 |