From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:a7b:c923:: with SMTP id h3mr2857248wml.34.1553181447476; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd4f:: with SMTP id u15ls1321471wrm.9.gmail; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwglGiOyXN3dwbrku9rhqgnKzCov9vdq+UnLp1p/Nvq0wGCDCaq7wb/YFNWPB5pEnQabhlg X-Received: by 2002:adf:81a1:: with SMTP id 30mr3225705wra.285.1553181447042; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553181447; cv=none; d=google.com; s=arc-20160816; b=nH4nTNZKgWya/rXq8KYkSZ++txYvT/o+f7Pgpn35uXjvxRrlLXtyEGjtk/r13he4hU dP0x+G2xge4wVN/4qIvF8abckcx2O/2SBjL1IOeRGmRpR9zFJ3ml19SmO2ACy8DQul7e V1Bg0tk+LdlFsOsgQYMQD0G73opNhRBs+PNJT3w06zrAaexeS0XTYICjGYKyjPIVrze6 fm7L5VmOENefXCETRl6cDcn2jCuY+QiShJ1lQUw3CbqZTKTJest5CRbHlP8xZvegAr0R 38lXu396euTJKKjj223otwdkzwAgeQ5vtSBFf0RKGJhogWarBiUoC7GHWcgC7LCnbkv+ k3cg== 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=JCr9Hw6EN3j1UeRXlDRPokmIYvUuVgEOnylU/f84kCgPgVLnykAg370Pq/MxvVV0oN fdZ5mx8wN+ZULmOrlO7hwMjNLtss7bmGXy8QcaqLjfPUMd/111ZjYZb0XedK9QmH64u1 Co3FjW6uyLGhBVxDuN2yeEVgE0MNFpHxh8ddhxIPHCJYlAqGTGkkAqZkuoVPvS/XMWvI d0SyP29JyN9FO4oJHHNIz+7ylC+z2OJNJWy/OX/v5bnZnhuDs92MdODVbvrsIc2UkeOK IuS+h4DlgRvpPvEGZyyXhognH60b7vmSCcicdAdjfC58kIA+RLPlSOiSnnLVGqJnyTV+ GMzg== 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 n5si338313wrj.0.2019.03.21.08.17.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 08:17:27 -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 x2LFHQc4023530 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 21 Mar 2019 16:17:26 +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 x2LFHQM5013389; Thu, 21 Mar 2019 16:17:26 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v8 2/7] Remove duplicate code from apt-keyring generation Date: Thu, 21 Mar 2019 16:15:21 +0100 Message-Id: <20190321151526.12001-3-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> References: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ttMQ6dXkVSdx 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