From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-host
Date: Wed, 18 Jul 2018 11:04:56 +0100 [thread overview]
Message-ID: <20180718100505.7546-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org>
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 <alex.bennee@linaro.org>
---
.../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
next prev parent reply other threads:[~2018-07-18 10:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 10:04 [Qemu-devel] [PATCH RFC 00/10] docker on non-x86 hosts Alex Bennée
2018-07-18 10:04 ` Alex Bennée [this message]
2018-07-27 7:56 ` [Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-host Fam Zheng
2018-07-30 8:22 ` Alex Bennée
2018-07-18 10:04 ` [Qemu-devel] [PATCH RFC 02/10] docker: change docker-image to docker-all-images target Alex Bennée
2018-07-18 10:04 ` [Qemu-devel] [PATCH RFC 03/10] docker: add a placeholder for handling non-x86 hosts Alex Bennée
2018-07-18 10:04 ` [Qemu-devel] [PATCH RFC 04/10] docker: don't include docker-arm64-cross on aarch64 hosts Alex Bennée
2018-07-18 10:05 ` [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 10:05 ` [Qemu-devel] [PATCH RFC 06/10] docker: fall-back to binfmt_misc debian-ppc64el-user-cross " Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 07/10] docker: fall-back to binfmt_misc debian-s390x-user-cross " Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 08/10] docker: disable additional non-x86 images Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 09/10] tests: tcg skip docker images we can't build Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 10/10] tests/tcg: debian-mips64el-user-cross fallback Alex Bennée
2018-07-27 8:26 ` [Qemu-devel] [PATCH RFC 00/10] docker on non-x86 hosts Fam Zheng
2018-07-30 8:21 ` Alex Bennée
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=20180718100505.7546-2-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).