mirror of
https://github.com/zardus/ctf-tools
synced 2025-03-14 13:56:57 +00:00
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff --git a/install.sh b/install.sh
|
|
index 7fa4885..374bfc0 100755
|
|
--- a/install.sh
|
|
+++ b/install.sh
|
|
@@ -10,6 +10,12 @@ else
|
|
echo "*** You'll need to install Ubuntu or get a working build env for qemu and python yourself ***"
|
|
fi
|
|
|
|
+echo "building python venv"
|
|
+python2 -m virtualenv venv
|
|
+source venv/bin/activate
|
|
+pip install --upgrade pip
|
|
+pip install --upgrade -r requirements.txt
|
|
+
|
|
# build qemu
|
|
if [[ "$(uname)" == 'Linux' ]]; then
|
|
if [ $(tracers/qemu/qira-i386 > /dev/null; echo $?) == 1 ]; then
|
|
@@ -27,12 +33,6 @@ else
|
|
echo "See other backends in qira/tracers, PIN may work on Windows and OS X"
|
|
fi
|
|
|
|
-echo "building python venv"
|
|
-virtualenv venv
|
|
-source venv/bin/activate
|
|
-pip install --upgrade pip
|
|
-pip install --upgrade -r requirements.txt
|
|
-
|
|
echo "running tests"
|
|
./run_tests.sh
|
|
|
|
diff --git a/tracers/qemu_build.sh b/tracers/qemu_build.sh
|
|
index 4f5e030..4f50e6c 100755
|
|
--- a/tracers/qemu_build.sh
|
|
+++ b/tracers/qemu_build.sh
|
|
@@ -7,5 +7,6 @@ if [ ! -d qemu/qemu ]; then
|
|
fi
|
|
|
|
cd qemu/qemu
|
|
-./configure --target-list=i386-linux-user,x86_64-linux-user,arm-linux-user,ppc-linux-user,aarch64-linux-user,mips-linux-user,mipsel-linux-user --enable-tcg-interpreter --enable-debug-tcg --cpu=unknown --python=python
|
|
+git apply ../../../../qemu.patch
|
|
+./configure --target-list=i386-linux-user,x86_64-linux-user,arm-linux-user,ppc-linux-user,aarch64-linux-user,mips-linux-user,mipsel-linux-user --enable-tcg-interpreter --enable-debug-tcg --cpu=unknown --python=python --disable-werror
|
|
make -j$(getconf _NPROCESSORS_ONLN)
|