From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: "Alex Bennée" <alex.bennee@linaro.org>, "Fam Zheng" <famz@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 1/4] docker: Use the host architecture
Date: Mon, 16 Jul 2018 23:29:21 -0300 [thread overview]
Message-ID: <20180717022924.25428-2-f4bug@amsat.org> (raw)
In-Reply-To: <20180717022924.25428-1-f4bug@amsat.org>
This image is badly named and not amd64 specific.
Use `dpkg --print-architecture` to get the host architecture.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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
next prev parent reply other threads:[~2018-07-17 2:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 2:29 [Qemu-devel] [PATCH 0/4] docker: Improve 'host-cross' image Philippe Mathieu-Daudé
2018-07-17 2:29 ` Philippe Mathieu-Daudé [this message]
2018-07-17 14:45 ` [Qemu-devel] [PATCH 1/4] docker: Use the host architecture Alex Bennée
2018-07-17 2:29 ` [Qemu-devel] [PATCH 2/4] docker: Improve how the virgl library is built Philippe Mathieu-Daudé
2018-07-17 2:29 ` [Qemu-devel] [RFC PATCH 3/4] docker: Rename 'amd64' image as 'host-cross' Philippe Mathieu-Daudé
2018-07-17 14:45 ` Alex Bennée
2018-07-17 14:48 ` Philippe Mathieu-Daudé
2018-07-17 2:29 ` [Qemu-devel] [RFC PATCH 4/4] docker: Add many libraries to the 'host-cross' image Philippe Mathieu-Daudé
2018-07-17 14:12 ` [Qemu-devel] [PATCH 0/4] docker: Improve " Cornelia Huck
2018-07-17 14:46 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180717022924.25428-2-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alex.bennee@linaro.org \
--cc=famz@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).