From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6726836208588029952 X-Received: by 2002:adf:b64b:: with SMTP id i11mr27704201wre.114.1566217944412; Mon, 19 Aug 2019 05:32:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5506:: with SMTP id b6ls4505868wrv.4.gmail; Mon, 19 Aug 2019 05:32:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7xO/Onxh7B7ktAaW6C7ctbtA/QEH3K1saQxOODDTIy3kA91NnfN565qYV9IwcdDxk6X72 X-Received: by 2002:a05:6000:1603:: with SMTP id u3mr27690109wrb.286.1566217943120; Mon, 19 Aug 2019 05:32:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566217943; cv=none; d=google.com; s=arc-20160816; b=iTObByXWAiyIMz5kTXB7NELsavnP4U3PGQd0tUuNzOzrJjHZ5tdJ6hnlMTlwPDIyWu G553D0Ob0zHXINyvyCg4FruDaq1ANw5FFLrjnp2EBOIs0jvebVsqdSgnvXZI70kn2Fet HTaYg/bS7p4VDWCsmXHQMwKVDa4drYGG5Gm+o4ZYrfQHBQRC2gjSnYMgjFt8AgpQcJau aNI4zDYChLLuU7shMLhLvL74AX/Q/fvvymeIlZkjVv1M6059n4oUSKg1xxAF2a7qrA/O oYkLb/SeZsjLLwscqHlYG/ItixGjLb9KQG6RYo7bw5zI48yJzScHIiO1Y3AV4b+XVpAQ 4JtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=ByrTE9rh/hhHM8oOcTr2ssm2Gsdksyin8mtKVbayqa8=; b=NEfVvNiRM+CMhIpjZOYHgyfV+mMr55e2AjPDMTbxTlj3R85aWgpYv91IxuYNcPdJUj qsaO+TCeO6S4FY7Xn7UmrJnNc6zr8yeTvbJgOXEXtA18k7Ug1x6oVonFBeN0LTAuDnuF CRNG3txg61jYS9dTREAfAf+IokjUzDOeF5y8srSno7hTwD3zSgNAJ0MMHgiJQZI7ss81 YOXELhmCd+wK69k6ibNkUsvOg3GSPEG6eqQSkqu2spVvC6gf+IBxA/4PQJtGe+pjFl5N 3nY/LS1KUgqOcDX7aMMP+erAXyDzFI8jR6eGKRhyuDsWUqLZM+9gx/D2QrZE2Pqpvzh+ HPMg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id b15si424563wmg.1.2019.08.19.05.32.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 05:32:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x7JCWM5u028073 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 19 Aug 2019 14:32:22 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x7JCWMkg023980; Mon, 19 Aug 2019 14:32:22 +0200 From: Jan Kiszka Subject: [PATCH v2] isar-bootstrap: Remove bogus "resolve=False" from getVar() To: isar-users , Baurzhan Ismagulov Message-ID: <39d1ca2c-92ea-451f-34e6-26a0741c51d9@siemens.com> Date: Mon, 19 Aug 2019 14:32:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: hsXWShxtXv0h From: Jan Kiszka 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 --- 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