public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "Andreas J. Reichel" <andreas.reichel.ext@siemens.com>
To: isar-users@googlegroups.com
Cc: Andreas Reichel <andreas.reichel.ext@siemens.com>
Subject: [PATCH v10 6/6] Give keyring to debootstrap when using cached base repo
Date: Thu,  2 May 2019 13:37:44 +0200	[thread overview]
Message-ID: <20190502113744.31753-7-andreas.reichel.ext@siemens.com> (raw)
In-Reply-To: <20190502113744.31753-1-andreas.reichel.ext@siemens.com>

From: Andreas Reichel <andreas.reichel.ext@siemens.com>

When using ISAR_USE_CACHED_BASE_REPO = 1, the keyring for debootstrap
has to be specified to which the user key for signing was added.

Signed-off-by: Andreas Reichel <andreas.reichel.ext@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 c6c3cde..09aed83 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -238,7 +238,8 @@ isar_bootstrap() {
         shift
     done
     debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}"
-    if [ ! "x${DISTRO_BOOTSTRAP_KEYS}" = "x" ]; then
+    if [ ! "x${DISTRO_BOOTSTRAP_KEYS}" = "x" ] || \
+       [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
         debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}"
     fi
     if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
-- 
2.21.0


  parent reply	other threads:[~2019-05-02 11:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-02 11:37 [PATCH v10 0/6] Fix usage of additional apt keys and repos Andreas J. Reichel
2019-05-02 11:37 ` [PATCH v10 1/6] Simplify and enhance apt-keyring generator Andreas J. Reichel
2019-05-02 11:37 ` [PATCH v10 2/6] Use apt-key to generate keyrings Andreas J. Reichel
2019-05-02 11:37 ` [PATCH v10 3/6] If we use a custom keyring debootstrap may fall to https Andreas J. Reichel
2019-05-02 11:37 ` [PATCH v10 4/6] raspbian-stretch: Use DISTRO_BOOTSTRAP_KEYS Andreas J. Reichel
2019-05-02 11:37 ` [PATCH v10 5/6] docs: Update user_manual.md Andreas J. Reichel
2019-05-02 11:37 ` Andreas J. Reichel [this message]
2019-05-13  4:57 ` [PATCH v10 0/6] Fix usage of additional apt keys and repos Maxim Yu. Osipov

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=20190502113744.31753-7-andreas.reichel.ext@siemens.com \
    --to=andreas.reichel.ext@siemens.com \
    --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