[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-hos
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-host |
Date: |
Wed, 18 Jul 2018 11:04:56 +0100 |
When building on non-x86 systems the base system will be correct so if
we avoid too many x86'isms in the install we can still use the image.
Signed-off-by: Alex Bennée <address@hidden>
---
.../dockerfiles/{debian-amd64.docker => debian-host.docker} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename tests/docker/dockerfiles/{debian-amd64.docker => debian-host.docker}
(91%)
diff --git a/tests/docker/dockerfiles/debian-amd64.docker
b/tests/docker/dockerfiles/debian-host.docker
similarity index 91%
rename from tests/docker/dockerfiles/debian-amd64.docker
rename to tests/docker/dockerfiles/debian-host.docker
index eb13f06ed1..3605cc4658 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-host.docker
@@ -30,9 +30,9 @@ RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure
--with-glx --disabl
# netmap
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
- linux-headers-amd64
+ linux-headers-$(dpkg --print-architecture)
RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap
-RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps
--kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install
+RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps
--kernel-dir=$(ls -d /usr/src/linux-headers-*) && make install
ENV QEMU_CONFIGURE_OPTS --enable-netmap
# gcrypt
--
2.17.1
- [Qemu-devel] [PATCH RFC 00/10] docker on non-x86 hosts, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 02/10] docker: change docker-image to docker-all-images target, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 03/10] docker: add a placeholder for handling non-x86 hosts, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-host,
Alex Bennée <=
- [Qemu-devel] [PATCH RFC 06/10] docker: fall-back to binfmt_misc debian-ppc64el-user-cross on non-x86, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 04/10] docker: don't include docker-arm64-cross on aarch64 hosts, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 07/10] docker: fall-back to binfmt_misc debian-s390x-user-cross on non-x86, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 08/10] docker: disable additional non-x86 images, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 10/10] tests/tcg: debian-mips64el-user-cross fallback, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 09/10] tests: tcg skip docker images we can't build, Alex Bennée, 2018/07/18
- [Qemu-devel] [PATCH RFC 05/10] docker: fall-back to binfmt_misc debian-mips64el-user-cross on non-x86, Alex Bennée, 2018/07/18
- Re: [Qemu-devel] [PATCH RFC 00/10] docker on non-x86 hosts, Fam Zheng, 2018/07/27