[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/4] docker: Use the host architecture
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[Qemu-devel] [PATCH 1/4] docker: Use the host architecture |
|
Date: |
Mon, 16 Jul 2018 23:29:21 -0300 |
This image is badly named and not amd64 specific.
Use `dpkg --print-architecture` to get the host architecture.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/docker/dockerfiles/debian-amd64.docker | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-amd64.docker
b/tests/docker/dockerfiles/debian-amd64.docker
index eb13f06ed1..3312374304 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -30,9 +30,11 @@ 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-*-$(dpkg --print-architecture)) && \
+ make install
ENV QEMU_CONFIGURE_OPTS --enable-netmap
# gcrypt
--
2.18.0