From patchwork Wed Jul 18 10:04:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142258 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp346939ljj; Wed, 18 Jul 2018 03:08:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdGV2X+UwF9STYNruRvQ/4/qL7lRIYOfKze4fFh7C7fcTb0k08LmnITH4pdEPu5xh27b0F0 X-Received: by 2002:aed:2561:: with SMTP id w30-v6mr4761763qtc.240.1531908523832; Wed, 18 Jul 2018 03:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908523; cv=none; d=google.com; s=arc-20160816; b=uwq1yApoES4IHH8otOAyuS2Ckava3k5hKKBgq2D+DQvBsbRAChu849Agon17IRBtRv y9AHbS7L0ARRzP0ppaeJ4yxr9/EePla517bEYORQdb6NDjcsvsxiNnBOuLHZ9j0AVpm9 MvFjcXQ8HrFzXOGUehsMM/zUnm4sVVHBwABdXyDAIMh8PGl64B+BNeW7fuG8cmqdGZBZ ruSGXAWGa56ru8CblsheyM6RNNKG9cEdu+Vptj1rBwqEu6IwRm9yN44uKhoYJLRq4Z28 sW2ZI8VcvUeThjXuMoi70UXS6D3jxM2HFmtlYc6JM77nQ0dfMr6gaCsmNEiQkrklyEir 04iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=LRI1kkKXd2sk8p7d7x3gJ0UIN85k1+U60Z57M/aOqpc=; b=SKlok05sCxhkFlPkY/MiMQwjFkuwYgrXDiOCw82vTA7UCFg1V34D8fzNdTNy9Yzd2p eAJpd+Pd5ZqeZml+5kMTN8h8h4I6FE1EgWhDp+8VO0/8bn7eg32e4YjWSeUlnI2lEJay FSI+IMpP2J4yIavNDIcoXS8Rt56w1xLJCXlpYdPMN+ztolbJOWD1i1Hl/u3hLDHIyHbN 4b/z12XT/d1rgvviM+KXsPL0wm/K5A9LSe2J3514A3Fcy3Y3rMhaFRZ9HjTfvVnwlbP+ 9BE+rZosVVdeE01oTDAXXnzWm5dUmJRPzNes85Ad03wS5iFUBQbPmoC/VKzMdvtHRKgk kYCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HlT7WArG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v57-v6si3043182qtk.315.2018.07.18.03.08.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:08:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HlT7WArG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjNz-0005Y5-Bj for patch@linaro.org; Wed, 18 Jul 2018 06:08:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKa-00038V-OE for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKW-00010H-EN for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:12 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41683) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKW-0000zl-7l for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:08 -0400 Received: by mail-wr1-x442.google.com with SMTP id j5-v6so4038581wrr.8 for ; Wed, 18 Jul 2018 03:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LRI1kkKXd2sk8p7d7x3gJ0UIN85k1+U60Z57M/aOqpc=; b=HlT7WArGtKIH+G7ozBTYz3Y+uRg81JhnagCSGDvf1eWZz3fV9UOG6zt1UKATWFJQlw D4+l7JniFP0W5iqN4T9oeTTj2M58aXEJLzet30t+PtRm7zs5cUQ6yL11T7wotePb+gw/ n6Jh5CuiC3fzv1vzQQDdF8+7kircdEM3YttfA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LRI1kkKXd2sk8p7d7x3gJ0UIN85k1+U60Z57M/aOqpc=; b=W7FOyAj26tlugbcUT1koSIXy0pd8A3LF/ebwCdcgvY587/9w5FkChgPgu+kK4ITn2P wcib7d2yL/rY7elcO+V+YTEvP86W/hEWsuAlmekdGff49oL0ppTHlybRowcNmBM81IjT /qbLe8Qk4pIw1KzsG3hyPYTMq5UUb/NZRl+zLwJIlxUjePu+zVtsapPpZcNTl0ohvTge IgvWb5IdtBTwhC42zYN8kAoiWB6AtoAMSnGccXa+oJX3gkTvBWmNIwEmBrJr3ycKpdXm ZydOP4uG4TCoQ5FcCH4TT9AVwO6NntJJQluoh4X9seixvJn31CA79qEcfkMWX9ryvVFP fm0w== X-Gm-Message-State: AOUpUlGZXY+7VBapPaS13oYCQeqvkmmE5MxD+VQ6PLUM58aO7zCUfH6I Hv3nR5CZsXhsvO3xBwBcjSDELw== X-Received: by 2002:adf:c08c:: with SMTP id d12-v6mr3766526wrf.268.1531908307166; Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n8-v6sm3658228wrt.56.2018.07.18.03.05.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:05 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 46FA33E02A5; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= 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 Date: Wed, 18 Jul 2018 11:04:56 +0100 Message-Id: <20180718100505.7546-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-host X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- .../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%) -- 2.17.1 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