From 84b89ad2133dc103c17e43c3d9939ed9f281ebce Mon Sep 17 00:00:00 2001
From: George Hotz <geohot@gmail.com>
Date: Sun, 31 Jan 2016 18:06:40 +0000
Subject: [PATCH] update binary distribution script and installer

---
 bdistrib.sh           | 27 +++++++++++++--------------
 install.sh            | 14 +++++---------
 tracers/qemu_build.sh |  1 -
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/bdistrib.sh b/bdistrib.sh
index 363d1a3b..63e575a6 100755
--- a/bdistrib.sh
+++ b/bdistrib.sh
@@ -10,7 +10,7 @@ echo "packaging version $VERSION"
 
 # VERSION is required to build the python thing
 echo "copying docs"
-cp -av VERSION README distrib/qira/
+cp -av VERSION README.md distrib/qira/
 
 # requires objdump
 # writable /tmp
@@ -53,20 +53,19 @@ mkdir -p distrib/qira/ida/bin
 echo "copying ida plugin"
 cp -av ida/bin/* distrib/qira/ida/bin/
 
-echo "copying qemu source"
+echo "copying qemu source build scripts"
 if [ $QEMU_SOURCE ]; then
-  #echo "copying qemu_mods for building qemu from source"
-  cp -Rav qemu_mods distrib/qira/
-  cp -av qemu_build.sh distrib/qira/
+  mkdir -p distrib/qira/tracers
+  cp -av tracers/qemu.patch tracers/qemu_build.sh distrib/qira/tracers
 fi
 
 if [ $QEMU_BINARIES ]; then
   # fairly standard deps + librt, libglib, libpcre
   echo "copying qemu"
-  mkdir -p distrib/qira/qemu
-  for arch in "i386" "arm" "x86_64" "ppc" "aarch64"; do
-    cp -v "qemu/qira-$arch" "distrib/qira/qemu/qira-$arch"
-    strip "distrib/qira/qemu/qira-$arch"
+  mkdir -p distrib/qira/tracers/qemu
+  for arch in "i386" "arm" "x86_64" "ppc" "aarch64" "mips" "mipsel"; do
+    cp -v "tracers/qemu/qira-$arch" "distrib/qira/tracers/qemu/qira-$arch"
+    strip "distrib/qira/tracers/qemu/qira-$arch"
     #upx -9 "distrib/qira/qemu/qira-$arch"
   done
 fi
@@ -76,11 +75,11 @@ mkdir -p distrib/qira/qiradb
 cp -Rav qiradb/* distrib/qira/qiradb/
 
 echo "copying pin"
-mkdir -p distrib/qira/pin
-cp -av pin_build.sh distrib/qira/
-cp -av pin/makefile pin/qirapin.cpp distrib/qira/pin/
-mkdir -p distrib/qira/pin/strace
-cp -av pin/strace/*.h distrib/qira/pin/strace/
+mkdir -p distrib/qira/tracers/pin
+cp -av tracers/pin_build.sh distrib/qira/tracers
+cp -av tracers/pin/makefile tracers/pin/qirapin.cpp distrib/qira/tracers/pin/
+mkdir -p distrib/qira/tracers/pin/strace
+cp -av tracers/pin/strace/*.h distrib/qira/tracers/pin/strace/
 
 #echo "copying cda"
 #mkdir -p distrib/qira/cda distrib/qira/cda/clang
diff --git a/install.sh b/install.sh
index f7b7d855..a360c561 100755
--- a/install.sh
+++ b/install.sh
@@ -14,25 +14,21 @@ if [[ "$unamestr" == 'Linux' ]]; then
   # we need pip to install python stuff
   # build for building qiradb and stuff for flask like gevent
   if [ $(which apt-get) ]; then
-    echo "installing apt packages"
+    echo "running apt-get update"
     sudo apt-get update -qq
-    sudo apt-get -qq -y install build-essential python-dev python-pip debootstrap debian-archive-keyring libjpeg-dev zlib1g-dev unzip wget graphviz curl
+    echo "installing apt packages"
+    sudo apt-get -qq -y install build-essential python-dev python-pip python-virtualenv debootstrap debian-archive-keyring libjpeg-dev zlib1g-dev unzip wget graphviz curl
 
     # install capstone
     curl -o /tmp/libcapstone3.deb http://www.capstone-engine.org/download/3.0.4/ubuntu-14.04/libcapstone3_3.0.4-0.1ubuntu1_amd64.deb
-    HASH=`sha256sum /tmp/libcapstone3.deb 2>/dev/null | cut -d' ' -f1`
-    
-    if [ "$HASH" != "$LIBCAPSTONE_SHA256" ]; then
 
+    HASH=`sha256sum /tmp/libcapstone3.deb 2>/dev/null | cut -d' ' -f1`
+    if [ "$HASH" != "$LIBCAPSTONE_SHA256" ]; then
       echo "Error: libcapstone3.deb has an invalid checksum."
       exit 1
-
     fi
-    
     sudo dpkg -i /tmp/libcapstone3.deb
 
-    # only python package we install globally
-    sudo -H $PIP install virtualenv
   elif [ $(which pacman) ]; then
     echo "installing pip"
     sudo pacman -S --needed --noconfirm base-devel python2-pip python2-virtualenv
diff --git a/tracers/qemu_build.sh b/tracers/qemu_build.sh
index 06089dc7..005afe9d 100755
--- a/tracers/qemu_build.sh
+++ b/tracers/qemu_build.sh
@@ -30,7 +30,6 @@ if [ ! -d qemu/qemu-latest ]; then
   wget http://wiki.qemu-project.org/download/qemu-$QEMU_VERSION.tar.bz2
 
   HASH=`sha256sum ./qemu-"$QEMU_VERSION".tar.bz2 2>/dev/null | cut -d' ' -f1`
-  
   if [ "$HASH" != "$QEMU_SHA256" ]; then
     echo "Error: qemu-"$QEMU_VERSION".tar.bz2 has an invalid checksum."
     exit 1