From 8a8923bd6c6a87f82195fb3c7335a2f38b25c545 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Tue, 7 Nov 2023 06:12:38 -0800 Subject: [PATCH] Switch QEMU to use quic/qemu and include sysemu Signed-off-by: Brian Cain --- Dockerfile | 5 ++--- build-toolchain.sh | 2 +- get-src-tarballs.sh | 8 +++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc2f921..020972a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,9 +62,8 @@ ENV MAKE_TARBALLS 1 #ENV CMAKE_URL https://github.com/Kitware/CMake/releases/download/v3.16.6/cmake-3.16.6-Linux-x86_64.tar.gz ENV LLVM_SRC_URL https://github.com/llvm/llvm-project/archive/llvmorg-${VER}.tar.gz -#ARG QEMU_REPO=https://github.com/quic/qemu -#ARG QEMU_SHA=master -ARG QEMU_SRC_URL=https://download.qemu.org/qemu-8.1.0.tar.xz +ARG QEMU_REPO=https://github.com/quic/qemu +ARG QEMU_REF=hexagon-sysemu-6-nov-2023 ENV MUSL_SRC_URL https://github.com/quic/musl/archive/7243e0d3a9d7e0f08d21fc194a05749e0bb26725.tar.gz ENV LINUX_SRC_URL https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.13.tar.xz diff --git a/build-toolchain.sh b/build-toolchain.sh index 23ae77a..d40a4cd 100755 --- a/build-toolchain.sh +++ b/build-toolchain.sh @@ -226,7 +226,7 @@ build_qemu() { ../qemu/configure --disable-fdt --disable-capstone --disable-guest-agent \ --disable-containers \ --python=$(which python3.8) \ - --target-list=hexagon-linux-user --prefix=${TOOLCHAIN_INSTALL}/x86_64-linux-gnu \ + --target-list=hexagon-softmmu,hexagon-linux-user --prefix=${TOOLCHAIN_INSTALL}/x86_64-linux-gnu \ # --cc=clang \ # --cross-prefix=hexagon-unknown-linux-musl- diff --git a/get-src-tarballs.sh b/get-src-tarballs.sh index abc7446..fdf5344 100755 --- a/get-src-tarballs.sh +++ b/get-src-tarballs.sh @@ -17,12 +17,10 @@ get_src_tarballs() { echo ${LLVM_SRC_URL} > ${MANIFEST_DIR}/llvm-project.txt cd - - wget --quiet ${QEMU_SRC_URL} -O qemu.tar.xz - mkdir qemu + git clone --branch ${QEMU_REF} ${QEMU_REPO} cd qemu - tar xf ../qemu.tar.xz --strip-components=1 - rm ../qemu.tar.xz - echo ${QEMU_SRC_URL} > ${MANIFEST_DIR}/qemu.txt + git remote -v > ${MANIFEST_DIR}/qemu.txt + git log -3 HEAD >> ${MANIFEST_DIR}/qemu.txt cd - wget --quiet ${MUSL_SRC_URL} -O musl.tar.xz