From patchwork Wed Jul 22 06:29:01 2020 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: 246969 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp268060ilg; Tue, 21 Jul 2020 23:31:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6/EpEqAtOfXNZkgLclqIo2FhXLQLQ/gqAz1AeN84GdnAF/abMS9yxWRGXULjcuRKWiDxc X-Received: by 2002:a25:4dc4:: with SMTP id a187mr43037292ybb.422.1595399479854; Tue, 21 Jul 2020 23:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399479; cv=none; d=google.com; s=arc-20160816; b=OcsSS6M+fmDkb2vf2SMgFmr+mDt3FuyZ0AHnpsj624o0+dBu1Iei3/MmOQiMrwRf/9 aMBbujJfWousCSxG94Li1Hjgc2i2h2mLLG+6utQphqyfi1e/FThoKKFSMqAK02ftTPid HE2Owwp/MNVrAudAGgWU720oMwEJvRN8aiiT6sqfZC1I5kVcWXlJqRRDdoBa084LSlqd MXMB3AIFP8hhgViATwpGOd4c4JO+5AQk8iV6xtDByZM8Na1H6xh0iRQrF0pY54KaUyog ktLqKwWbaEcDhgfqqfk9zWhbX61ON6A90nYKKk4bw29RXSuch8sGagY7YumvkHbiOKM4 txhw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=pVMfracDJydLXMCggpl4mxu1W+C4dGbG4uOzhxzcx8s=; b=0aCkJFv1e6DM41Emc6WjNO5cIekEHRh+gWDRGLE9mWoVIttsCN3qFpTTdfnedSXnYW XXzB37YaVM+5qqILqK9xIz1Lbh/rBzUisak6atmCKRLRA2nbUA1n4DpScMd+74QzLPPG vpca7e40jtZt5sMHLDZmuFuysEVgGSa4XZ1KQ1gqYYoOlnM41Wn0rBORgCBA+wvOoXFC c3JqYFuUwqG9GraZAE7JOBBDZ72A9pbc4PN1aTKbrzuxvaaXdRNlyJu27Aea+7rPLv67 SNZH7m33hmoaXw0MnSFO5QxUuvS+8xfMYEgX41MoXzEg5clRW6d3sivDx3OPwd2T+oj+ NiiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NeVAkK0u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id v84si23133850ybv.78.2020.07.21.23.31.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:31:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NeVAkK0u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:59970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8Hf-0002Gg-9s for patch@linaro.org; Wed, 22 Jul 2020 02:31:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fo-0007YD-Lm for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:24 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fm-0006wN-RO for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:24 -0400 Received: by mail-wr1-x443.google.com with SMTP id z15so694871wrl.8 for ; Tue, 21 Jul 2020 23:29:22 -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=pVMfracDJydLXMCggpl4mxu1W+C4dGbG4uOzhxzcx8s=; b=NeVAkK0uW4Q2i3+1m53uFSfZLXpe56PAklR7eMtlbnLxeKjp8X9Y443eZQBaPlHGLD bF0WNOh6z6WBgqcDBX9M0qG3eMN3gMnjyShsgtML7zvRk4qWklIXjKEnFlL2cNnr6DeA KUtwzx3bWQHOMUsZtHvh0/THlpV3gdZualf6qD/h+HXHTYlTsKXb8ezuKAM+SnLz2MaL 527dtgBbaOSsk9bwmQiR4bviDzl8M0sgrvO4+nWfxOJ3fSTYPoZTh4bWPfhQH00l6+J7 U6N8MoPqeUwgt174UbmKrOqlAm4cT3vt59vPoOEt1/5IGMWo+mRp1ErJ907vlGHSJRcW n19w== 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=pVMfracDJydLXMCggpl4mxu1W+C4dGbG4uOzhxzcx8s=; b=qGTc1aYFmYys4pVS09//h0bw3LA6ASHxKx1uiABYK9osqoY4Tdl2BExzrnB8Syh1pl 09mdo5r72S5mWlQmGP0jrvmllIAVJ0pzBDD3jRvSbggrlRy+171SfDSpdJLfaL4TI+r6 hOEm40qamIxwnJ89f6f07V2P8l7RXhxwUZONX0fYH8zFQFIszrFYbcseuB9497orotDY Qkb2oA3w5AZg4gBgH87hoLiybFN1AmSfLS4uBUqO7K0mv6N1OCclEDBvqnwkn9EZe86B PUuvN4dXoYggbsJh3czNrZj6AN7Y1iJ5DgpuSGiS9mwcHkLya6K0KVeILqz6kLdASz8n DDkw== X-Gm-Message-State: AOAM531s3+1qkHxjXXelVURyF6J+DWe3rgeuOIH6qr+kKOXyIDyaDlpV hSekTP8A/B5uxjGtKLj9NVCtew== X-Received: by 2002:a5d:40cb:: with SMTP id b11mr30208239wrq.263.1595399361583; Tue, 21 Jul 2020 23:29:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g14sm43358632wrw.83.2020.07.21.23.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A84F1FF9A; Wed, 22 Jul 2020 07:29:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/12] tests/docker: add support for DEB_KEYRING Date: Wed, 22 Jul 2020 07:29:01 +0100 Message-Id: <20200722062902.24509-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For installing stuff from sid or ports you may need to manually specify the location of the keyring. You can even import keys into your personal keyring and point it there, e.g.: gpg --keyserver keyring.debian.org --recv-keys 84C573CD4E1AFD6C make docker-binfmt-image-debian-sid-hppa DEB_TYPE=sid DEB_ARCH=hppa \ DEB_URL=http://ftp.ports.debian.org/debian-ports/ \ EXECUTABLE=./hppa-linux-user/qemu-hppa V=1 \ DEB_KEYRING=${HOME}/.gnupg/pubring.kbx Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-bootstrap.pre | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index c164778c302..35c85f7db8a 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -79,6 +79,13 @@ else fi fi +# +# Add optional args +# +if [ -n "${DEB_KEYRING}" ]; then + DEBOOTSTRAP="${DEBOOTSTRAP} --keyring=${DEB_KEYRING}" +fi + # # Finally check to see if any qemu's are installed #