From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:a2e:944f:: with SMTP id o15mr1279230ljh.28.1552991431532; Tue, 19 Mar 2019 03:30:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8013:: with SMTP id j19ls757513ljg.0.gmail; Tue, 19 Mar 2019 03:30:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqwc48XgZ4unR9Q+CUQhuy6zxpjzFlCOj6DlC6E5qLCG7XQazbRt9RKvp6lbhg6b4ZxEXFkZ X-Received: by 2002:a2e:85cd:: with SMTP id h13mr1224496ljj.8.1552991430964; Tue, 19 Mar 2019 03:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552991430; cv=none; d=google.com; s=arc-20160816; b=RlvS1QPoM/25n94YeygW/HikvZRgPLSR8Mm8BxEN9btL5O/QRsOh83OS/gnSrrFq9C Hd40oQzN5QJYwlIQqQgq5zAYwqc1sdFOsp2+E7DbNbfI7JKT+LfOMFUketqPpMNiAktp nW9WNjpboh9+y84lWhWlJ4mfPUF6FOtkiLyLOTA/J6px9zSzi14pV5MDs5r0w2GfdzSg WVn8SQvF8EiBG3g9D8JwFR04Cp1RAf9X/v7xeOHHADfLcaWvq6n9KB3VMZc/ns6eLZdi A34gva9/TfmYmRrYI1JO4p85iH75vac+Bei7S4A56XgXnND7gWNu1POblv6r345U9xcC xUig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=E3TQ7jH221KA/JxFQMrMp+rOgyH0zzUY9SNRGsJZ2o8=; b=fkawm3NE4ZRbfurB0SP56bACKZnM+wH4u9NG60JEDqTi+gM6pWxc8en6Tc7UOnmU94 xpdejM7z+AnxPloJdQoFE9zkVB0z1UqCI2V5NV6SdmVyzIAibNMU2/KoyXeLgSXnfoBM 9F59TCZ3tKW6lNn07TU2FHNpQ975SVo+zAxQM9b8FX+1QCFe8eCpZOoMN082CkM9p8g0 5Mmc10hJ4fCzX51FxjB//p+wiA+bDZzI2TczqknNbSl8ess5Ka3NBOoEifaCYlAhAQCD 2UaYfaHpozwwekklMqxfUHquufsxDdLFV/5rnRFSzNNVuF8s2yF++PXX8dIwNaVGrIln 98Dg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h14si728405lja.2.2019.03.19.03.30.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 03:30:30 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x2JAUTtt013010 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Mar 2019 11:30:30 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id x2JAUTC3003355; Tue, 19 Mar 2019 11:30:29 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v6 2/5] Remove duplicate code from apt-keyring generation Date: Tue, 19 Mar 2019 11:28:21 +0100 Message-Id: <20190319102824.14851-3-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319102824.14851-1-andreas.reichel.ext@siemens.com> References: <20190319102824.14851-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 6rfP6Pb1Qtti From: Andreas Reichel Signed-off-by: Andreas Reichel --- .../isar-bootstrap/isar-bootstrap.inc | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 2910eea..4526aa7 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -35,22 +35,21 @@ inherit base-apt-helper python () { from urllib.parse import urlparse distro_apt_keys = d.getVar("DISTRO_APT_KEYS", False) - wd = d.getVar("WORKDIR", True) + aptkeys = [] + if distro_apt_keys: - d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") - for key in distro_apt_keys.split(): - url = urlparse(key) - filename = os.path.basename(url.path) - d.appendVar("SRC_URI", " %s" % key) - d.appendVar("APTKEYFILES", " %s" % filename) + aptkeys += distro_apt_keys.split() if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): own_pub_key = d.getVar("BASE_REPO_KEY", False) if own_pub_key: - d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") - for key in own_pub_key.split(): - url = urlparse(key) - d.appendVar("SRC_URI", " " + key) - d.appendVar("APTKEYFILES", " " + wd + url.path) + aptkeys += own_pub_key.split() + + d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") + for key in aptkeys: + url = urlparse(key) + filename = os.path.basename(url.path) + d.appendVar("SRC_URI", " %s" % key) + d.appendVar("APTKEYFILES", " %s" % filename) } def aggregate_files(d, file_list, file_out): -- 2.21.0