From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:a2e:8ec9:: with SMTP id e9mr337064ljl.6.1551889695085; Wed, 06 Mar 2019 08:28:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:5f05:: with SMTP id t5ls260948lfb.12.gmail; Wed, 06 Mar 2019 08:28:14 -0800 (PST) X-Google-Smtp-Source: APXvYqwjtmPkvhnHWz2cFBJ6JXHkuqT4hh3HVJCK4N17TU4BREFW3RiMr6I7DDJqWgbwAxWlDsNo X-Received: by 2002:ac2:5301:: with SMTP id c1mr520762lfh.17.1551889694576; Wed, 06 Mar 2019 08:28:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551889694; cv=none; d=google.com; s=arc-20160816; b=etSKVM5zQc3PtJASBZrWRJVSqOoEgZTJEEJQMXyadxmfTEmIrHcReyOujwTw6QitRO sRruUpHKn0IffNjau/+prTqB679GVp2YoKdNflpIsrMTXGfvZytmTCrVDs4+YUAc4OzW rwGkClsdZXvZ9Pd8+2Bblc6J6rqbz53oy39UhnNm84ZtmJBcSaVg55S4+I33vXLtu75D GNHJ7pC3GR1Hzx462ysQ6ZxaqNIRSfxCW4Y0Oy0pZ5H+oMQyL+QijH9wIetqYsHMUu+c iYwmJzJKOPQajkHRIvTHtYEu1+6nLTVluSk+78dZ/kH7bm/D1fVJN8EAxAofrNsp4wH3 +a9g== 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=1UVfopamv32iKlpsEdsbL47G+TMuPbMCLNE7KkeJSY0=; b=HOYbpeE+AR+2udZvbvMgCz3zwBUJWFNoTdg+A/usBYZehpgk9PClPrf91ufa6BVY5H vbVYj5gz3XlpuW8jFOnlr1vhlopN0pxb4uCM6F4zOuelUTh7ZehAh4ZMwzxbkoXdEaH2 ORSS/OOmev0OgX42B9bzOe0XdT4dk0Y3XDXPbion2S8MW3DcV4xrkfwAoGZq74k/3xbv khW6TgT8PUw797okj+/NJEZgU1TPGUET44EwUFgT+tAeH6f94d+Qp0QOaRTOf26WZfXs T1em5icQZDKhUniNZRnMPEGJTTBSbhafTkgDLgjvCTn364uAXSqSVvo4AzAqaAbP1LbW jznw== 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 v27si96780lje.0.2019.03.06.08.28.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 08:28:14 -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 mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x26GSDiu026052 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Mar 2019 17:28:13 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x26GSDvD010079; Wed, 6 Mar 2019 17:28:13 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v3 2/6] Remove duplicate code from apt-keyring generation Date: Wed, 6 Mar 2019 17:26:14 +0100 Message-Id: <20190306162619.826-3-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190306162619.826-1-andreas.reichel.ext@siemens.com> References: <20190306162619.826-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: yTYguazzlvjR 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 eb9a9df..204ed1f 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