From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:a1c:be10:: with SMTP id o16mr1102559wmf.24.1551968710865; Thu, 07 Mar 2019 06:25:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:8085:: with SMTP id b127ls16362wmd.0.canary-gmail; Thu, 07 Mar 2019 06:25:10 -0800 (PST) X-Google-Smtp-Source: APXvYqyWtxXATOMdhm4IjekNkisPCcQGUl+YYCuiijnvsjTMlQ0zqLn/1Of71OrFsHNbIMs12dUY X-Received: by 2002:a1c:55c9:: with SMTP id j192mr986500wmb.21.1551968710377; Thu, 07 Mar 2019 06:25:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551968710; cv=none; d=google.com; s=arc-20160816; b=HNBXF4IIBsY9PJ/wAtDdMtclzmAmBBBne/ov+y8l4CgRfCmC+5HtAZqPAXQOoy3CBy zE9YKfEv4Y6w4VPl4odjJYfp63kBRuDeyISUM9RBeCU3hEjN8REialdqO72fqs0esjCz f4A/NzYZDK6uKgljuYmunccW1olre0XywUbYl4I8GTtj0aIroZl4v0DHtaTRhogOEPgr 9gfyA0SyFQqWHKPj2/mgHtOMhWZMy2pzZ7qD23oV1NAunXcAa75GgagmHiPWiIUHhI8v WpBn5zN50DBBbpymt445fAUCQ/L74o8XGTRuegI0ekf6o2dyeXjK2ApcFE0ficVOAvJW QxBw== 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=CUZfosoaIIycvc+Hh+Om8/yTq6Ey4WNgJYX1d6ibTkc=; b=lYCOjp2und6VT9WA1CHy+AvJA52ZEt10sYisAzQfuSWbKHeSLsc8u+JVhseF7exxHj OHnjmHGVqAxxdxLIsVM0AkwXXc3rLKD3v/sALu3glbwmMEIO/Zy27QHCbmvyUtbhylrE SqIHcZS6JejTeCwqtcWaMgWWGBoRlT5uJO+7NBOdcky3S5notZQri4GRnPS12QPahMRo g9iNMtcknV3NKOU5TzQWweTV8GFpCSPJDH9rURXv3SqueweK3mKWse5ZSrfyHLRK9vab KI5xqCg9vrdjdMw0wH24eGvUutFq1fjNFeZ5HGXjsA0X4OrBWwCGivR1dx2AGcghrJ0g sxuw== 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 f185si231236wme.1.2019.03.07.06.25.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 06:25:10 -0800 (PST) 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 x27EP9ZJ004429 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Mar 2019 15:25:10 +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 x27EP9RI020333; Thu, 7 Mar 2019 15:25:09 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v4 3/6] Remove duplicate code from apt-keyring generation Date: Thu, 7 Mar 2019 15:23:01 +0100 Message-Id: <20190307142304.14508-4-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> References: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: bV4KRezcYV9j From: Andreas Reichel Signed-off-by: Andreas Reichel --- .../isar-bootstrap/isar-bootstrap.inc | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 9506741..2d6b761 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -35,23 +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) - filename = ''.join([wd, url.path]) - d.appendVar("SRC_URI", " %s" % key) - d.appendVar("APTKEYFILES", " %s" % filename) + 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