From: "Andreas J. Reichel" <andreas.reichel.ext@siemens.com>
To: isar-users@googlegroups.com
Cc: Andreas Reichel <andreas.reichel.ext@siemens.com>
Subject: [RFC v1 1/3] Fix path to user gpg-keys
Date: Tue, 26 Feb 2019 14:48:42 +0100 [thread overview]
Message-ID: <20190226134844.8632-2-andreas.reichel.ext@siemens.com> (raw)
In-Reply-To: <20190226134844.8632-1-andreas.reichel.ext@siemens.com>
From: Andreas Reichel <andreas.reichel.ext@siemens.com>
If the key is fetched from remote (currently http, https),
use the basename, otherwise, use the absolute path.
Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
---
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 234d339..25133be 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -40,7 +40,10 @@ python () {
d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}")
for key in distro_apt_keys.split():
url = urlparse(key)
- filename = ''.join([wd, url.path])
+ if "https://" in key or "http://" in key:
+ filename = os.path.basename(url.path)
+ else:
+ filename = ''.join([wd, 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.20.1
next prev parent reply other threads:[~2019-02-26 13:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 13:48 [RFC v1 0/3] Fix additional apt repos with foreign keys Andreas J. Reichel
2019-02-26 13:48 ` Andreas J. Reichel [this message]
2019-02-26 15:33 ` [RFC v1 1/3] Fix path to user gpg-keys Henning Schild
2019-02-26 13:48 ` [RFC v1 2/3] Refactor gpg code to use apt code Andreas J. Reichel
2019-02-26 14:07 ` cedric_hombourger
2019-02-26 15:57 ` Henning Schild
2019-02-26 15:39 ` Henning Schild
2019-02-26 13:48 ` [RFC v1 3/3] Use all source lists in target root apt Andreas J. Reichel
2019-02-26 15:06 ` [RFC v1 0/3] Fix additional apt repos with foreign keys 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=20190226134844.8632-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