From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6729358150130991104 X-Received: by 2002:aa7:d30a:: with SMTP id p10mr16628806edq.79.1566800789676; Sun, 25 Aug 2019 23:26:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:6a07:: with SMTP id o7ls5108194ejr.9.gmail; Sun, 25 Aug 2019 23:26:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqxtH4bBC1z/qxcA3VBwVBbuEZHUtSfQ4y/JeGFMjerMA6oYvvbmqZuRRhKIfDhZPZcU3o1w X-Received: by 2002:a17:906:32c2:: with SMTP id k2mr15063300ejk.308.1566800789081; Sun, 25 Aug 2019 23:26:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566800789; cv=none; d=google.com; s=arc-20160816; b=v+dQ9iLaHAkeYQE4wqy9e1pi4nx9meOvEsc5ckS73ulkkfL8SIpAg97sO68aMFibqq 67GZXsUv2sfrcpa0eWlEbbV6feZkLNjmt0sC91flumurcLbY2H03ITaicGazdiK0zZrf fEw57IHUtx7pzEZiEww/KZFRR8MhaBF5MpH4STOwqHLxsUdRCYzB4R0fCDIFStpwL+u5 lgDXN8gJLywKojTmm/z51U7hvmeN+qzKOPlkuHSQ1gcNuH6+SvA+DsN63CfTu290K2kI I6Wh1aMfNo+Rm3ZLpkUl8oIzYUiKcQLGS87Jq6XWrgBAvxF3dGKCjJzzQ9nk21E0Ph2x K3/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=ZOwNH6LkPvpzQ8eMCdvCoNw6x2lanUe309p97sHkJS4=; b=JwU3nUymAF0kctXgwZocGAy8XmhIue75sLiyY7+a5614QckQhrjx5OPyTQj8cEsMFg 0hY9+xxJ3X7zoSsE3d7MGcGTrFRvsSLaqy5mp9aGjWr9zXwX3r/UkRMGKxbNrI7dFeh4 aSWdJQzPe28Nau6ZcwvfafEon0m9hj8d7FRgzd6flrDUytnhdkXcUVb4qT0WhrqExui2 84P5y31BBVTb+fQpk6V11xf8ZuDsJH/2meDaxt1++lYsoQ725wxctE/sQ14CZoIP4SqO 28A3Fc/hrV77R6KXwoXdpZxgVjHyEFzKfjAHMkTcva6jiq2SJKVLXHoy49cRAmPrmHf2 SkdQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id m16si588640edv.2.2019.08.25.23.26.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 23:26:29 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x7Q6QScV026484 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Aug 2019 08:26:28 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.99]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x7Q6QRGt015165 for ; Mon, 26 Aug 2019 08:26:27 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 01/26] isar-bootstrap: Consider DISTRO_BOOTSTRAP_KEYS for gnupg installation Date: Mon, 26 Aug 2019 08:26:02 +0200 Message-Id: <69e17864c20dadce89e21eaaeef0f8856729e096.1566800787.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 5tCZKGq28DBE 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