On Wed, 07/18 11:04, Alex Bennée wrote: > 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 <[email protected]> > --- > .../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
Curious: why isn't this "ls -d linux-headers-*-$(dpkg --print-architecture)", like above? > ENV QEMU_CONFIGURE_OPTS --enable-netmap > > # gcrypt > -- > 2.17.1 >
