Merge pull request #842 from pschichtel/bugfix/qemu-download-urls

Correct the qemu download URLs
This commit is contained in:
Matt McCormick 2024-07-26 19:31:52 -04:00 committed by GitHub
commit 3995c0cf44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 12 additions and 10 deletions

View File

@ -1098,6 +1098,8 @@ jobs:
run: xz -d -k < ./cache/base.tar.xz | docker import - dockcross/base:latest run: xz -d -k < ./cache/base.tar.xz | docker import - dockcross/base:latest
- name: build - name: build
env:
BUILD_CMD: build --cache-from type=gha --cache-to type=gha,mode=max
run: make ${{ matrix.arch_name.image }} run: make ${{ matrix.arch_name.image }}
- name: basic test - name: basic test

View File

@ -165,7 +165,7 @@ web-wasi-threads.test: web-wasi-threads
# #
# manylinux2014-aarch64 # manylinux2014-aarch64
# #
manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile manylinux2014-x64
@# Register qemu @# Register qemu
docker run --rm --privileged hypriot/qemu-register docker run --rm --privileged hypriot/qemu-register
@# Get libstdc++ from quay.io/pypa/manylinux2014_aarch64 container @# Get libstdc++ from quay.io/pypa/manylinux2014_aarch64 container

View File

@ -15,7 +15,7 @@ ENV CROSS_TRIPLE m68k-unknown-uclinux-uclibc
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \ curl -L https://download.qemu.org/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
cd qemu-${QEMU_VERSION} && \ cd qemu-${QEMU_VERSION} && \
./configure --target-list=m68k-softmmu --prefix=/usr && \ ./configure --target-list=m68k-softmmu --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \

View File

@ -15,7 +15,7 @@ ENV CROSS_TRIPLE powerpc64le-unknown-linux-gnu
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \ curl -L https://download.qemu.org/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
cd qemu-${QEMU_VERSION} && \ cd qemu-${QEMU_VERSION} && \
./configure --target-list=ppc64le-linux-user --prefix=/usr && \ ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \

View File

@ -15,7 +15,7 @@ ENV CROSS_TRIPLE powerpc64le-unknown-linux-gnu
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \ curl -L https://download.qemu.org/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
cd qemu-${QEMU_VERSION} && \ cd qemu-${QEMU_VERSION} && \
./configure --target-list=ppc64le-linux-user --prefix=/usr && \ ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \

View File

@ -15,7 +15,7 @@ ENV CROSS_TRIPLE riscv32-unknown-linux-gnu
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \ curl -L https://download.qemu.org/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
cd qemu-${QEMU_VERSION} && \ cd qemu-${QEMU_VERSION} && \
./configure --target-list=riscv32-linux-user --prefix=/usr && \ ./configure --target-list=riscv32-linux-user --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \

View File

@ -15,7 +15,7 @@ ENV CROSS_TRIPLE riscv64-unknown-linux-gnu
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \ curl -L https://download.qemu.org/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
cd qemu-${QEMU_VERSION} && \ cd qemu-${QEMU_VERSION} && \
./configure --target-list=riscv64-linux-user --prefix=/usr && \ ./configure --target-list=riscv64-linux-user --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \

View File

@ -15,7 +15,7 @@ ENV CROSS_TRIPLE xtensa-fsf-linux-uclibc
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \ curl -L https://download.qemu.org/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
cd qemu-${QEMU_VERSION} && \ cd qemu-${QEMU_VERSION} && \
./configure --target-list=xtensa-linux-user --prefix=/usr && \ ./configure --target-list=xtensa-linux-user --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \

View File

@ -1,5 +1,5 @@
# Recent versions address yum functionality # Recent versions address yum functionality
FROM quay.io/pypa/manylinux2014_x86_64:2023-08-27-bd7ad21 FROM quay.io/pypa/manylinux2014_x86_64:2024-07-20-e0def9a
LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

View File

@ -1,5 +1,5 @@
# Recent versions address yum functionality # Recent versions address yum functionality
FROM quay.io/pypa/manylinux2014_i686:2023-08-27-bd7ad21 FROM quay.io/pypa/manylinux2014_i686:2024-07-20-e0def9a
LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

View File

@ -1,5 +1,5 @@
# Recent versions address yum functionality # Recent versions address yum functionality
FROM quay.io/pypa/manylinux_2_28_x86_64:2022-11-28-5d13db4 FROM quay.io/pypa/manylinux_2_28_x86_64:2024-07-20-e0def9a
LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"