* [PATCH] isar-bootstrap: Remove bogus "resolve=False" from getVar()
@ 2019-08-19 11:20 Jan Kiszka
0 siblings, 0 replies; only message in thread
From: Jan Kiszka @ 2019-08-19 11:20 UTC (permalink / raw)
To: isar-users, Baurzhan Ismagulov
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>
---
Needs to go in before "isar-bootstrap-host: Introduce
HOST_DISTRO_BOOTSTRAP_KEYS".
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 45b1608..8658e7e 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()
--
2.16.4
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-08-19 11:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-19 11:20 [PATCH] isar-bootstrap: Remove bogus "resolve=False" from getVar() Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox