From 374b3eab4f8f986bacb5062f59805ba03a391f84 Mon Sep 17 00:00:00 2001 From: Dorian Rudolph Date: Sun, 24 Jul 2022 00:33:30 +0200 Subject: [PATCH] Apply smurfd's patch (https://github.com/geohot/qira/issues/258) --- install.sh | 5 ++++- tracers/qemu_build.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 7fa4885b55..e199016840 100755 --- a/install.sh +++ b/install.sh @@ -4,7 +4,10 @@ if [ $(which apt-get) ]; then echo "installing deps for ubuntu" sudo apt-get -y install git curl python python-dev python3-pip build-essential pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev - sudo pip3 install virtualenv + # install pip2 + curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py + sudo python2 get-pip.py + sudo pip2 install virtualenv else echo "*** You'll need to install Ubuntu or get a working build env for qemu and python yourself ***" diff --git a/tracers/qemu_build.sh b/tracers/qemu_build.sh index 4f5e030d32..dc9b885642 100755 --- a/tracers/qemu_build.sh +++ b/tracers/qemu_build.sh @@ -7,5 +7,5 @@ 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 +./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=python2.7 --disable-werror make -j$(getconf _NPROCESSORS_ONLN)