From: Baurzhan Ismagulov <ibr@radix50.net>
To: isar-users@googlegroups.com
Subject: [PATCH v3 2/2] bootstrap: really fix gpg bootstrap when not signed
Date: Mon, 18 Nov 2019 18:08:50 +0100 [thread overview]
Message-ID: <20191118170850.12861-3-ibr@radix50.net> (raw)
In-Reply-To: <20191118170850.12861-1-ibr@radix50.net>
From: Henning Schild <henning.schild@siemens.com>
ef5255a8f8006e6f4 fixed one case but broke another. The existence of the
key file does not mean that it actually contains our bootstrap keys. It
contains keys from multiple sources.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index b506f30..d614d9a 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -233,7 +233,8 @@ isar_bootstrap() {
debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}"
if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then
debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}"
- else
+ fi
+ if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then
debootstrap_args="$debootstrap_args --no-check-gpg"
fi
E="${@ isar_export_proxies(d)}"
--
2.20.1
next prev parent reply other threads:[~2019-11-18 17:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 17:08 [PATCH v3 0/2] Fix " Baurzhan Ismagulov
2019-11-18 17:08 ` [PATCH v3 1/2] ci: always test signed and unsigned repo builds Baurzhan Ismagulov
2019-11-18 17:08 ` Baurzhan Ismagulov [this message]
2019-11-18 17:55 ` [PATCH v3 0/2] Fix gpg bootstrap when not signed Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191118170850.12861-3-ibr@radix50.net \
--to=ibr@radix50.net \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox