From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>,
Baurzhan Ismagulov <ibr@ilbers.de>
Subject: [PATCH v2] isar-bootstrap: Remove bogus "resolve=False" from getVar()
Date: Mon, 19 Aug 2019 14:32:22 +0200 [thread overview]
Message-ID: <39d1ca2c-92ea-451f-34e6-26a0741c51d9@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
We need the resolved content of the variables here. Not resolving means
that variables with late resolutions will break this anonymous python
block.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Changes in v2:
- added one more cosmetic case
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 45b1608..1eb2ac6 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -35,16 +35,16 @@ DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org/\S* file:///${REPO
inherit base-apt-helper
python () {
- distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS", False) or "").split()
+ distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split()
- third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS", False) or "").split()
+ third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS") or "").split()
# The cached repo key can be both for bootstrapping and apt package
# installation afterwards. However, debootstrap will include the key into
# the rootfs automatically thus the right place is distro_bootstrap_keys.
if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')):
- own_pub_key = d.getVar("BASE_REPO_KEY", False)
+ own_pub_key = d.getVar("BASE_REPO_KEY")
if own_pub_key:
distro_bootstrap_keys += own_pub_key.split()
@@ -169,7 +169,7 @@ def get_distro_needs_https_support(d, is_host=False):
return ""
def get_distro_needs_gpg_support(d):
- apt_keys = d.getVar("THIRD_PARTY_APT_KEYS", False)
+ apt_keys = d.getVar("THIRD_PARTY_APT_KEYS")
if apt_keys and apt_keys != "":
return "gnupg"
return ""
--
2.16.4
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
next reply other threads:[~2019-08-19 12:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 12:32 Jan Kiszka [this message]
2019-08-22 11:12 ` Baurzhan Ismagulov
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=39d1ca2c-92ea-451f-34e6-26a0741c51d9@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=ibr@ilbers.de \
--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