From patchwork Mon Jul 2 14:30:19 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: 140790 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp39571ljj; Mon, 2 Jul 2018 07:46:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpciOZsxs7Vi9OU1p82EOclXsi8ss0iy5G06VJLJ2Y62k08T3/mEhS71z25uZjqoDCe0xF12 X-Received: by 2002:a37:5687:: with SMTP id k129-v6mr22813147qkb.163.1530542763959; Mon, 02 Jul 2018 07:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542763; cv=none; d=google.com; s=arc-20160816; b=IR8F1lF716XLue2pqZi5VBjf3MbjNtctjYiR84MDUdFVa45nTICYIDt7KrMXpNMQdf j5QACpj7u6g6oYPF8mHGy7jS4aWblIpQN329tfHiL701HsOf40GXyX8j6R2qDlH0tZXS xzYV0O8BFEH7SgqXwE5hz2wXQw9zglgvDQjiSI17oHeiEwICAInGROsLmJ7M/c2RxJXb wATMq+NyoQRRBbfjPH6cMgskiaTl6HWtUlVEbHcqAegIEvYEa7u1saoQUEi45EM2LiuQ +u+7bhU+8xA3pJCEg9CEYEGaGp8dng4vDvYH5WH0GQEopMF1OpaAGZ+Jh2mdqj4Rbscq XLwg== 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=KvBRF7k12Fj7sP/xS61WUQpDD6AkSj7CddHTemC2z9s=; b=x49fsM21m9YQ78yDJesUkxbwuDcU9A3ng8v80q0I85MdIHROHLnvEnIRIjR4/S2Iy6 5IXfIYGvzF7ZOo4U6HQxma8Iaoy4gtXCnZsvPj/qBSFqalTT2O6Uj+JXr1Y+y1+JPQME E29X2P/68PvrVB/GKe9+/Kbyf3JxjMD3krtV+1Bnv5FE705RGoMc6802s44opAAO8Ncb YCPOfPtsjFvbY7nGbl0xxvmk62U7f8VbvXEz8Pyurdm3vCC7fjxTkP46pU1dIqAm5Hl+ 84JW8JQCSZ13Obq+iTZ2vbGUVGadS/M18GipDFSaMkFTwUR6W/KbBuaFcSQGp3v68Ohc Iobg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WaYzN+sb; 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 e63-v6si2316364qtb.5.2018.07.02.07.46.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:46:03 -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=WaYzN+sb; 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]:33226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa05b-0000H7-51 for patch@linaro.org; Mon, 02 Jul 2018 10:46:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035I-PW for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxt-0005Ch-8W for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:38733) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxt-0005Bn-0U for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:05 -0400 Received: by mail-wm0-x22d.google.com with SMTP id 69-v6so8961357wmf.3 for ; Mon, 02 Jul 2018 07:38:04 -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=KvBRF7k12Fj7sP/xS61WUQpDD6AkSj7CddHTemC2z9s=; b=WaYzN+sbThUOZhr0RxrJq5iVuyXV66hR6xwo+qorRIEdXz4UXoFlUZOH6ALAx7fT1f h9qWYrbKqw5KqGZXEKUT+zG0Nr8P7+o6SaMvix4a3seZKLHSh9YWKBctk5mQ0JYWT39C BmxUb8RIaj5TweGD0ZbR7CDQgfcFrIZqD1tac= 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=KvBRF7k12Fj7sP/xS61WUQpDD6AkSj7CddHTemC2z9s=; b=sZapj4dZEmxY05SOi1uHxlgEydXD6YZhYalKZt3Sy7bTHDoQRUWimi0VXsoJuFM9UX UT8Zsm5mbYH03whkYy+ojmjTbY298+faiMXlHqlMf1OmwfrhQ6q7edUefb1cbBdTQmBO FLa+DIGYN6xR2o1t1E/Xj2sISzIo2wpcKwbv7EgMOGi81IzoPRv4IQRgvHLE/snoExwA w2TQXV6M50lb1V99kds6E+9vYW8I9OtB/sU7Wsb5L1G/mP6ASy7TTQYk0Og1LFuN8BHS SxAhEenpARFHey0l8Pd16xtlG5zvmGFG+bJYb+Gyn8pC1toYyXMO7wrwLoYPYdxwonsD qO8g== X-Gm-Message-State: APt69E2sMpO/t1+CDRAZWdMAkX6NepsudyLoz/44MPkUDiZY3+OsZEu9 FxXoRFC32nT1ng3imC2TzEg8Yw== X-Received: by 2002:a1c:2905:: with SMTP id p5-v6mr1008604wmp.78.1530542283927; Mon, 02 Jul 2018 07:38:03 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s10-v6sm11683195wmb.12.2018.07.02.07.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 37D4F3E0B71; Mon, 2 Jul 2018 15:30:23 +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: Mon, 2 Jul 2018 15:30:19 +0100 Message-Id: <20180702143021.18864-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:c09::22d Subject: [Qemu-devel] [PATCH v3 18/20] 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 --- v3 - don't include stray whitespace fix --- tests/docker/docker.py | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index b279836154..69e7130db7 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -113,6 +113,10 @@ def _copy_binary_with_libs(src, dest_dir): _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()