From patchwork Fri Jun 29 20:52:29 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: 140650 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1307353ljj; Fri, 29 Jun 2018 14:04:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdW8WNGrQDLjlR9542+zrP5ncu/zhnuqk+1kRZfHUSHvmUyB4A0tdIJmYLyJE5FOvrQwI4n X-Received: by 2002:aed:35c2:: with SMTP id d2-v6mr14961803qte.219.1530306279426; Fri, 29 Jun 2018 14:04:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306279; cv=none; d=google.com; s=arc-20160816; b=fPHbLjQ3zT6nhoiKyxw6a5nnGigqgzK0cXafUlwpHE1RijxesujdMxg3S3u6O2zMn4 vTCezYRP18hwpEqKNdnJyMOlXK9l043GaiOIRMNrkj+ROHfgCQo2oPC0vvcFfRHiYW/m nE26KWA4Bfqg8xnvyoSG9mDUv1NoDN6alQ6pzxXiKOQgrPfRATdqsL+icxV0Q5n6h0H6 jbmH8u0gSyH8680KXR2tcQFQRSOwOHafMk3fw3p4DlDsJe1GRJfvVMdl6oybstek6Qes aXH8Wzlce7ZUffGeYtNswSGYxy0OPXMYd3o1PAHUc95r3Xwfo2Kfr8jbXwgMEPzwOKYk THDQ== 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=nMMG5FoBgUUuNeOJSa1/MRhr8LQ3s2pKl/ud7dsXoLI=; b=lGG841topLrgGoLgxFsgCT/EsevMwbtkgsiXxZxUy+up5Jb7f4PqAxPUsQ9hNhulsZ +MDD5I+3MaCeX6mKiCLstKwt/G5lVVVylPJgN/bQKCCQcNEaJcDLcWGFgOFNDCOrAD5l mll6hPQUGLcA+jWb5xzQ68EtUL78+m9acDSQeJEcs1tFOuM8RiIm8p5Jf/OS03/LsXBF /M10Rx/ooRn8rnnA0DWPPo9SPa5l07IgK4VOSDKMkplq4vGRuRASLrDhuyZUmh6WnxRW F97pz8AxsuhkodgyxTTnVynABtQHwhg8WJbajkCpOWhqF+7NGZNomEUtQjwMDg6iNGIz y1ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BjWCgn+V; 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 y38-v6si3438700qvc.17.2018.06.29.14.04.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:04:39 -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=BjWCgn+V; 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]:44478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0ZK-00032B-U9 for patch@linaro.org; Fri, 29 Jun 2018 17:04:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gm-Ur for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sf-0005IE-2T for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:50 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:45038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Se-0005G7-RS for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:44 -0400 Received: by mail-wr0-x243.google.com with SMTP id p12-v6so9977198wrn.11 for ; Fri, 29 Jun 2018 13:57:44 -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=nMMG5FoBgUUuNeOJSa1/MRhr8LQ3s2pKl/ud7dsXoLI=; b=BjWCgn+V9z84kMiKlIhb+N4R0HhmuXm9g3TgsDwdwdkb6oO2t0gCoIDL3/WUIcRAD7 lGwzHy0g+Qpdfh28CnHqv0gc8DrYsFmdGrD1jzOVW8GEyfrsDTpwAVZO2eqFm8z2QY6C V+lCM2kGS7uReD0kopf78R+PtlJZCFDORg2cc= 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=nMMG5FoBgUUuNeOJSa1/MRhr8LQ3s2pKl/ud7dsXoLI=; b=ZhCFMwoGx0/kepmnb7I8XouOjUtZ+wDOVsYoq78WX6q9aqR05qtyftDcrkdOhY8jU0 XBCKnJVXBc3o11oJ+eFFBEv9sKR/88aH+zfxMm2W1kO9/Zx1ffyLCERee2OrT/5fMQ13 gGpCQVinJ1+AW+/kEZ67hCf8xYWKLUjMWwuFcLCJKI4LliDEgJ2+1+zgKk+xJXmgjizJ MKFH5wxXJqImgTpi/JOtqXm64S1D/TMhG9JEvtrj5ED8FqFXxZrQyJI2NeO9p8FikZ0+ bMV+CfTi0ePej9poyaS850+t/Izdj0zBrS7+ERNbN2LItN7UxxDLe79c7ZaAD55OenNH xMDQ== X-Gm-Message-State: APt69E1KyWd/lFzLrB2f5ETjw5xgu1g8UaP6OfqooyyX+voYaxOnZKBC /20NNa10D0aK9NOXmv3dngTPeQ== X-Received: by 2002:adf:9ed0:: with SMTP id b16-v6mr9996615wrf.170.1530305863431; Fri, 29 Jun 2018 13:57:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 4-v6sm4386705wmh.14.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 370663E0B6C; Fri, 29 Jun 2018 21:52:34 +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: Fri, 29 Jun 2018 21:52:29 +0100 Message-Id: <20180629205232.27190-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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:400c:c0c::243 Subject: [Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debian-%-user targets 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These will have been build with debootstrap so we need to check against the debian-bootstrap dockerfile. This does mean sticking to debian-FOO-user as the naming conventions for boot-strapped images. The actual cross image is built on top. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 388e86ada2..8ceaf78681 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -110,9 +110,13 @@ def _copy_binary_with_libs(src, dest_dir): if libs: for l in libs: so_path = os.path.dirname(l) - _copy_with_mkdir(l , dest_dir, so_path) + _copy_with_mkdir(l, dest_dir, so_path) def _read_qemu_dockerfile(img_name): + # special case for Debian linux-user images + if img_name.startswith("debian") and img_name.endswith("user"): + img_name = "debian-bootstrap" + df = os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") return open(df, "r").read()