From patchwork Mon Jul 27 12:23:52 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: 247173 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4757195ilg; Mon, 27 Jul 2020 05:29:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEB58UHDeFTi7n/KPUPz4RNvKNDhVYsp+g6c3xBvUQTVHgGfI9qEKyShTpmIFJUiizgm6l X-Received: by 2002:a25:4252:: with SMTP id p79mr34757010yba.159.1595852981600; Mon, 27 Jul 2020 05:29:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595852981; cv=none; d=google.com; s=arc-20160816; b=Iw0kx89KP9x4NQ6yuEat5yBSg5y2GPj31acRSZppuliLF+VqOY68FXS4Y2k6cXPsEC iMcCWR9s/c9dQAO9PlAcHq3NQRGJpKq7tpCuc0ympwjl0FNudyXtdUiBKIY13LFQ3Mc0 xerr7zWSCNDTon7FQyxOU0Z+ECtUTSDPMXEo3tSdgK8nJDBznauFTcIQJUs7MseJqfw1 cSTPQzjMqsdWZRGroxu8OqY3K4M8NEyB31vzrPV3HnFGmv4ZfS3YeDFPbD0dHBEMzJu/ 43GinzahaAumFF7lPH+39nBqNg2ufSQS9bVCRLatK4Z8bsA2VD+dLZyEuC3zKr/4hmYI 8bUw== 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=a9EvgEdBVuLI76HbSujJ5mYXWXYqdvnxohcwrpyH65M=; b=ecrSHYVNxutQIghetmoC75wtHUNzuYO/AWOt3xuHuJMz7/66Qc9FBoruAt3s4apV4F Un7SypwZorbvQrTlnUS/3EpICRm0v5MTT56/narWowIGyKQGDdakQ+IOrLQsgBslrjrz ra80KUcVb7ri21LoiyD6PDVsIIY/pym0GdRn+BT3WRSDc3pTn16E3hrwUtMNlWUcURuu o/bMQKQDEXSOEuiZBNNhAtGUsVyR3P5ASn+KuEWvcXDxWaKQm4oO2JnOg2TxuEeTl+VE ZbiAveOwCffYQrxlISF8viC7MKTKOE1kk4K2A+TOCIMdDCc1ebvyNE4qrYDUxMPHNb8Z xZaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fMMntSOp; 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 d25si10257143ybe.407.2020.07.27.05.29.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jul 2020 05:29:41 -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=fMMntSOp; 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]:32794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k02GD-00070s-2w for patch@linaro.org; Mon, 27 Jul 2020 08:29:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k02B2-0007Sz-5i for qemu-devel@nongnu.org; Mon, 27 Jul 2020 08:24:20 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:40278) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k02B0-0006SA-CC for qemu-devel@nongnu.org; Mon, 27 Jul 2020 08:24:19 -0400 Received: by mail-wr1-x433.google.com with SMTP id l2so4116183wrc.7 for ; Mon, 27 Jul 2020 05:24:17 -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=a9EvgEdBVuLI76HbSujJ5mYXWXYqdvnxohcwrpyH65M=; b=fMMntSOpw1y0nccc5yEPvcQcvTWTbr8gsbSWvcQ/URszXIzWDzLVx7TRO3DTq3dDoL plXy2PZ/2zGkj6c/i/iLjrMZB7dYQxfwrdWgOnVUMS6WK5CtNgsO6YwsNT+8bgnI6bJq SG+8OBpTgrg6AH0/Z8Zu9qOGKdoTZx0vnuptQKqgfFGGEArwR5raNDk8+wWGVlq+VdKk HAltWb7rvA3Ef9DEzXPiYl4YuUhN3n45KCOIyX3NxmM6Xcexb5/Jc1Br1eGkZ3ZE9Zzy krxTdmuQ8iZO8dW1HywiFNIuyy5Tyuzj/v3F9hd5DfOMJzNSQKqt8/dsr43PdZZs+SP3 05fg== 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=a9EvgEdBVuLI76HbSujJ5mYXWXYqdvnxohcwrpyH65M=; b=ft3Yr1u+K/S9GXHrR/ifI+i7EiQKlKz0tGT5TW38Lcj61hXEfxJUUJ/f4pbQXAf05J eZo/VoN5GZ79KFIMQCp1Dv+34VD4SjP8E328Xq1je37gqT3gPIpfu/rQcPFEd4RjfzI0 EyVJksF3DtQTJh2cle8UUyKMY6DUSfpV6+RCmGKMKYWs6aSrvzp5Tp0iU/0QDTSxwGf2 juYvH/NKlb9YcBNP4uWqyAP4uaeoIPKmhuOAg51F+gK/rwnlmdMGcmKzC6akV7a/3kE2 37nQ8enT8DpcHIQ0FHNz/BqJnfAykqgdFPmXtuiVEFxxegtXmYPUNIlOLSCnpLd0WQKT vgyg== X-Gm-Message-State: AOAM530pWrl0mD/+h7MAb/wrI3FxP6Uvjs8ECLNCD4FdjCpFDv4MIYd7 uxtY1wtDp0nptnoUbpcDJMLbwQ== X-Received: by 2002:a5d:490c:: with SMTP id x12mr19399070wrq.238.1595852657093; Mon, 27 Jul 2020 05:24:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w7sm18622137wmc.32.2020.07.27.05.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 05:24:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6A49B1FF9A; Mon, 27 Jul 2020 13:23:58 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/16] tests/docker: add support for DEB_KEYRING Date: Mon, 27 Jul 2020 13:23:52 +0100 Message-Id: <20200727122357.31263-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200727122357.31263-1-alex.bennee@linaro.org> References: <20200727122357.31263-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200724064509.331-12-alex.bennee@linaro.org> -- 2.20.1 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 #