From: "Andreas J. Reichel" <andreas.reichel.ext@siemens.com>
To: isar-users@googlegroups.com
Cc: Andreas Reichel <andreas.reichel.ext@siemens.com>
Subject: [PATCH v6 3/5] Fix fetched key location in apt-keyring generator
Date: Tue, 19 Mar 2019 11:28:22 +0100 [thread overview]
Message-ID: <20190319102824.14851-4-andreas.reichel.ext@siemens.com> (raw)
In-Reply-To: <20190319102824.14851-1-andreas.reichel.ext@siemens.com>
From: Andreas Reichel <andreas.reichel.ext@siemens.com>
Use bb.fetch2.Fetch to retrieve the final filename after it is
downloaded. This way we don't have to guess (wrongly), and also
additional SRC_URI parameters like subdir or filename are usable now.
Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
---
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 4526aa7..1f8f178 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -33,7 +33,6 @@ DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org file:///${REPO_BA
inherit base-apt-helper
python () {
- from urllib.parse import urlparse
distro_apt_keys = d.getVar("DISTRO_APT_KEYS", False)
aptkeys = []
@@ -46,9 +45,9 @@ python () {
d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}")
for key in aptkeys:
- url = urlparse(key)
- filename = os.path.basename(url.path)
d.appendVar("SRC_URI", " %s" % key)
+ fetcher = bb.fetch2.Fetch([key], d)
+ filename = fetcher.localpath(key)
d.appendVar("APTKEYFILES", " %s" % filename)
}
--
2.21.0
next prev parent reply other threads:[~2019-03-19 10:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 10:28 [PATCH v6 0/5] Fix usage of additional apt keys and repos Andreas J. Reichel
2019-03-19 10:28 ` [PATCH v6 1/5] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Andreas J. Reichel
2019-03-19 10:28 ` [PATCH v6 2/5] Remove duplicate code from apt-keyring generation Andreas J. Reichel
2019-03-19 10:28 ` Andreas J. Reichel [this message]
2019-03-19 10:28 ` [PATCH v6 4/5] Use apt-key to generate apt-keyring Andreas J. Reichel
2019-03-19 10:28 ` [PATCH v6 5/5] If we use a custom keyring debootstrap may fall to https Andreas J. Reichel
2019-03-19 11:34 ` [PATCH v6 0/5] Fix usage of additional apt keys and repos Maxim Yu. Osipov
2019-03-19 11:42 ` Andreas Reichel
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=20190319102824.14851-4-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