From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:a7b:ce1a:: with SMTP id m26mr313529wmc.16.1552916044950; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:400e:: with SMTP id n14ls3239785wrp.16.gmail; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxWhopfoMo2QNXENGgwfdtV5CChI6yW1abi/tEST7hrodLEnK/qj5SKGs4eJFUWaEbBcKgy X-Received: by 2002:adf:f54b:: with SMTP id j11mr375339wrp.32.1552916044473; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552916044; cv=none; d=google.com; s=arc-20160816; b=BxgyxqmyFUvAuizwpqoPVtgqMqR5NRDM0/zyxv1wu+x155ZRXO2GKtnjxFMqP/Rdj+ G3OKtEFF0feo+RmO+ospyVFOw06Y7MK/LHQ4RMtDnRhdUMqxF6E5IX/IqwKkZ76HEbLu vQH/e+08rXeg4OaKe+UVU7Mb0ZEYGGWt9PHlC0I7Bn24qYy9tWPv7PLLOAPxPY7G7/Eq TPYGETGtlugKjuss8pZhjG0qF+w+s8VCrRbo8V05vsJZxMS/BwyayPIRgGtdojebAcuy UDdIo6pK2YMR6/azsnxLz7gfV+eo07dSIvif/O9Z+khJI8sOX3sE+DGMb8DTX4FDtMlp qAHw== 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=vXzgdftoEsAwdCOgq1k4KDZH86BuAPokS2fGLhFVWaKG/maaZwkVvRfnuzgqA6GlMS RWIoNtUep8H/sTZlHVFCsv8UZpze9pZfhbyddgT+6KRdsSomwFYkl/TxDECIOsrfql1Y Lnwq2bM9ZluvJgLl+Lb7kcBmOfMto5gu2JpNmzhaBBIwaQPfihglM5BStGdtH2FfZKz9 P5a51d6ntoBHxkLSWaX+VH7fJZLGRLZPBXOzzFpejx7szLsNs8AL12KKrUBJyqFXpsjG +R+d89gMv8TXHNDbj5bg3tszR/2jqr8Epzzcf1XuSc0zOCsYKkyLB/M5svU2gaGJheew IT6A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id y192si296717wmd.1.2019.03.18.06.34.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 06:34:04 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x2IDY3V1032413 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 18 Mar 2019 14:34:04 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id x2IDY3t7014851; Mon, 18 Mar 2019 14:34:03 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v5 2/5] Remove duplicate code from apt-keyring generation Date: Mon, 18 Mar 2019 14:32:01 +0100 Message-Id: <20190318133205.29705-3-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318133205.29705-1-andreas.reichel.ext@siemens.com> References: <20190318133205.29705-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: sZ/YlFe/xt4E 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