From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6726870116592517120 X-Received: by 2002:a1c:1a4c:: with SMTP id a73mr21256979wma.109.1566221499969; Mon, 19 Aug 2019 06:31:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c44b:: with SMTP id l11ls3964387wmi.0.canary-gmail; Mon, 19 Aug 2019 06:31:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwg6wESb9wD9nMc7nOdVF7I6CFastdAhVteB3RD2uCyjKXBuXLtnHpbmjlEQwrXv/ZK0HOx X-Received: by 2002:a7b:c318:: with SMTP id k24mr21838448wmj.113.1566221499413; Mon, 19 Aug 2019 06:31:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566221499; cv=none; d=google.com; s=arc-20160816; b=Cgl5QWz5cadMvRd5bQ6nr/2P4ZOLRcC1MmzP4k3T8+dsI2bohg3VIbeAcakG7FHnAS 5fpwrc9LjFwMn0lFahhFm3kkyX5k1uTr+jVlvkqocpj8joi2E7UI9+9eC0b5RKygI8vB TOhRTo68BA9So79g8CRJqlw8pu6oz4vX24+ui5ZVXE+A50HbvE24Pb7DVRdljH3h0UxA 0Tla5AyzE3F1L3XOeHzY2cOz3NtwI55UgVmqblVT6egf2qD+KJNQ0JPBeAPDIKCdzPsI XL+YDcbMWDzZeR86uP1yHPL+sOQgVOjBi3BUIegfsvKw1ama7zQ8OeV49H1FOmc5/+RQ Bqjw== 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=JhvxgP6U2xuHTiQOKetuP7qBjWVr09q06NpLQPGkAfs=; b=Hll3FeiWCaaS5d4eSgGyjqVUi/ZDMtOqUJcBcU8N6I/LX5p4aJtwnAMAWuHjfICfkk Iz+qKGEjoz34cK9+3WwdAbEdKnWV3Iq2V76yUIUk5yJU7E+jPMZFqo9giAw0Wxukuudh 7dlwRX6+PaklKz7XnpuHr+iP3GFG2ZOjkx+DB849EUXgeQqzmpV0TE05fu/L19Elsvnx h4VrpkPS0uLxcRRmPBKvv6bDA2151ii/ziUvoVCbqTg+Jr7cBS1ZWol2c4ztHaUqO7Ly bjwxcXBocJYNQfMYO8Bvq5F+r0fjXuFgaim/2ZSGJ9EKWBvojY2tt6ov0Ko5fMVX5Zfq N73w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id y4si743859wrp.0.2019.08.19.06.31.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 06:31:39 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x7JDVdUw014426 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 19 Aug 2019 15:31:39 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x7JDVdii017693 for ; Mon, 19 Aug 2019 15:31:39 +0200 From: Jan Kiszka Subject: [PATCH] isar-bootstrap: Consider DISTRO_BOOTSTRAP_KEYS for gnupg To: isar-users Message-ID: <10aeba2a-c04b-5ee5-c6dc-281911de72a7@siemens.com> Date: Mon, 19 Aug 2019 15:31:39 +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: mPFxQ5Llo8ZC From: Jan Kiszka We also need gnupg when using a custom bootstrap key. Signed-off-by: Jan Kiszka --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 1eb2ac6..bcd644b 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -169,8 +169,9 @@ 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") - if apt_keys and apt_keys != "": + apt_keys = d.getVar("DISTRO_BOOTSTRAP_KEYS") or "" + apt_keys += " " + (d.getVar("THIRD_PARTY_APT_KEYS") or "") + if apt_keys != " ": return "gnupg" return "" -- 2.16.4 -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux