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 v3 1/6] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS"
Date: Wed,  6 Mar 2019 17:26:13 +0100	[thread overview]
Message-ID: <20190306162619.826-2-andreas.reichel.ext@siemens.com> (raw)
In-Reply-To: <20190306162619.826-1-andreas.reichel.ext@siemens.com>

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

This reverts commit af983a13b6f4cee5d4af5e5cf6318231e02775c9.

We do not want to guess where the downloaded file will be. This does
not work anymore if the key is downloaded from remote with a URL.

Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
---
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 234d339..eb9a9df 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -40,7 +40,7 @@ python () {
         d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}")
         for key in distro_apt_keys.split():
             url = urlparse(key)
-            filename = ''.join([wd, url.path])
+            filename = os.path.basename(url.path)
             d.appendVar("SRC_URI", " %s" % key)
             d.appendVar("APTKEYFILES", " %s" % filename)
     if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')):
-- 
2.21.0


  reply	other threads:[~2019-03-06 16:28 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-06 16:26 [PATCH v3 0/6] Fixes usage of additional apt keys and repos Andreas J. Reichel
2019-03-06 16:26 ` Andreas J. Reichel [this message]
2019-03-06 17:18   ` [PATCH v3 1/6] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Henning Schild
2019-03-07  9:15     ` Andreas Reichel
2019-03-06 16:26 ` [PATCH v3 2/6] Remove duplicate code from apt-keyring generation Andreas J. Reichel
2019-03-06 16:26 ` [PATCH v3 3/6] Fix key filename in apt-keyring generator Andreas J. Reichel
2019-03-06 16:26 ` [PATCH v3 4/6] Use apt-key to generate apt-keyring Andreas J. Reichel
2019-03-06 17:33   ` Henning Schild
2019-03-07  9:06     ` Andreas Reichel
2019-03-07 13:43       ` Henning Schild
2019-03-06 16:26 ` [PATCH v3 5/6] Use all source lists in target root apt Andreas J. Reichel
2019-03-06 17:27   ` Henning Schild
2019-03-07  9:36     ` Claudius Heine
2019-03-06 16:26 ` [PATCH v3 6/6] If we use a custom keyring debootstrap may fall to https Andreas J. Reichel
2019-03-06 17:43   ` Henning Schild
2019-03-07  9:14     ` Andreas Reichel
2019-03-07 13:41       ` Henning Schild
2019-03-07 14:41       ` 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=20190306162619.826-2-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