From 262ff52c59ccddc68163a03fe3f6c75d9781b1a6 Mon Sep 17 00:00:00 2001 From: binaryfz Date: Tue, 27 Jul 2021 15:18:26 +0800 Subject: [PATCH 1/3] update qemu download link --- tools/setup_tools.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh index 981b862008..b57976a177 100755 --- a/tools/setup_tools.sh +++ b/tools/setup_tools.sh @@ -146,10 +146,9 @@ if [ ! -f $TOOLS/qemu/package/usr/bin/qemu-aarch64 ]; then cd $TOOLS echo Start wget qemu-user ... rm -rf qemu - git clone --depth 1 https://gitee.com/hu-_-wen/qemu.git - cd qemu - mkdir -p package - dpkg-deb -R qemu-user_2.5+dfsg-5ubuntu10.48_amd64.deb package + wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb + mkdir -p qemu/package + dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu/package echo Installed qemu-aarch64 fi @@ -171,9 +170,6 @@ ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib ln -s -f ${MAPLE_ROOT}/tools/qemu/package/usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 -if [ -f /usr/bin/qemu-aarch64 ];then - ln -s -f /usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 -fi mkdir -p ${MAPLE_ROOT}/testsuite/tools mkdir -p ${MAPLE_ROOT}/testsuite/tools/bin -- Gitee From 8ad705fefd51eb8af8bb59bb4896b06a5356c37e Mon Sep 17 00:00:00 2001 From: binaryfz Date: Tue, 27 Jul 2021 16:05:53 +0800 Subject: [PATCH 2/3] mod qemu path --- tools/setup_tools.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh index b57976a177..2954da5578 100755 --- a/tools/setup_tools.sh +++ b/tools/setup_tools.sh @@ -142,13 +142,13 @@ if [ ! -f $MAPLE_ROOT/third_party/libdex/prebuilts/aarch64-linux-gnu/libz.so.1.2 fi # install qemu-user 2.5.0 -if [ ! -f $TOOLS/qemu/package/usr/bin/qemu-aarch64 ]; then +if [ ! -f $TOOLS/qemu/usr/bin/qemu-aarch64 ]; then cd $TOOLS echo Start wget qemu-user ... rm -rf qemu wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb - mkdir -p qemu/package - dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu/package + mkdir -p qemu + dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu echo Installed qemu-aarch64 fi @@ -169,7 +169,7 @@ ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/clang ${TOOL_BIN_PATH}/clang ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib -ln -s -f ${MAPLE_ROOT}/tools/qemu/package/usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 +ln -s -f ${MAPLE_ROOT}/tools/qemu/usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 mkdir -p ${MAPLE_ROOT}/testsuite/tools mkdir -p ${MAPLE_ROOT}/testsuite/tools/bin -- Gitee From 06e9152f92b649da8b84d07003c66e8c66b7f51d Mon Sep 17 00:00:00 2001 From: binaryfz Date: Fri, 30 Jul 2021 15:04:52 +0800 Subject: [PATCH 3/3] add qemu downlink for ubuntu20.04 --- tools/setup_tools.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh index 2954da5578..7628dda1cc 100755 --- a/tools/setup_tools.sh +++ b/tools/setup_tools.sh @@ -146,9 +146,14 @@ if [ ! -f $TOOLS/qemu/usr/bin/qemu-aarch64 ]; then cd $TOOLS echo Start wget qemu-user ... rm -rf qemu - wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb mkdir -p qemu - dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu + if [ "$OLD_OS" == "1" ];then + wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb + dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu + else + wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_4.2-3ubuntu6.17_amd64.deb + dpkg-deb -R qemu-user_4.2-3ubuntu6.17_amd64.deb + fi echo Installed qemu-aarch64 fi -- Gitee