Skip to content

Commit

Permalink
Switch QEMU to use quic/qemu and include sysemu
Browse files Browse the repository at this point in the history
Signed-off-by: Brian Cain <bcain@quicinc.com>
  • Loading branch information
androm3da committed Nov 7, 2023
1 parent f448012 commit 8a8923b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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-
Expand Down
8 changes: 3 additions & 5 deletions get-src-tarballs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8a8923b

Please sign in to comment.