public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
	Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 2/2] bootstrap: really fix gpg bootstrap when not signed
Date: Fri, 15 Nov 2019 18:00:44 +0100	[thread overview]
Message-ID: <20191115170044.26683-2-henning.schild@siemens.com> (raw)
In-Reply-To: <20191115170044.26683-1-henning.schild@siemens.com>

From: Henning Schild <henning.schild@siemens.com>

ef5255a8f8006e6f4 fixed one case but broke another. The existance 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 | 4 +++-
 1 file changed, 3 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..7353abf 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -233,7 +233,9 @@ 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" ] && [ -z "${BASE_REPO_KEY}" ]
+    then
         debootstrap_args="$debootstrap_args --no-check-gpg"
     fi
     E="${@ isar_export_proxies(d)}"
-- 
2.23.0


  reply	other threads:[~2019-11-15 17:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-15 17:00 [PATCH 1/2] ci: always test signed and unsigned repo builds Henning Schild
2019-11-15 17:00 ` Henning Schild [this message]
2019-11-15 17:06 ` Henning Schild
2019-11-15 17:08   ` Jan Kiszka
2019-11-18 17:05   ` Baurzhan Ismagulov
2019-11-18 17:52     ` Henning Schild
2019-11-19 16:39       ` Baurzhan Ismagulov
2019-11-15 17:21 ` [PATCHv2 " Henning Schild
2019-11-15 17:22   ` 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=20191115170044.26683-2-henning.schild@siemens.com \
    --to=henning.schild@siemens.com \
    --cc=isar-users@googlegroups.com \
    --cc=jan.kiszka@siemens.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