From nobody Wed Nov 5 08:50:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153054272711279.49469637243396; Mon, 2 Jul 2018 07:45:27 -0700 (PDT) Received: from localhost ([::1]:33226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa04w-0000H7-Av for importer@patchew.org; Mon, 02 Jul 2018 10:45:22 -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) 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) 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-Google-Smtp-Source: AAOMgpe3kGMzin0Dq2CLNNscVm+BzmTd74HLKJRiEbhgGV0qZxl/MWIbqkNSt0MnWnKvgTeyKoAtxA== X-Received: by 2002:a1c:2905:: with SMTP id p5-v6mr1008604wmp.78.1530542283927; Mon, 02 Jul 2018 07:38:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- v3 - don't include stray whitespace fix --- tests/docker/docker.py | 4 ++++ 1 file changed, 4 insertions(+) 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) =20 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 =3D "debian-bootstrap" + df =3D os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") return open(df, "r").read() --=20 2.17.1