From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:a7b:cf0f:: with SMTP id l15mr343007wmg.7.1553002647005; Tue, 19 Mar 2019 06:37:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d49:: with SMTP id t70ls437954wmt.12.canary-gmail; Tue, 19 Mar 2019 06:37:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7dJQzwOEOu0JpyLkj1mRiEsghaov26f496BebiLnHcigCF71mLlwkobMZ6RwtYUqKZLUD X-Received: by 2002:a1c:cf48:: with SMTP id f69mr344224wmg.13.1553002646450; Tue, 19 Mar 2019 06:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553002646; cv=none; d=google.com; s=arc-20160816; b=pNoNf3ImpgkJOADjZNzrg6yUUZqW+FYWX0/JRj/21V8Cn2ehsUyhCeWPB+AwNMt9aL BL1iNRZ60zGNe/X82Hr40b0QZv/vWZWZi6kUJzuy/xyZHI/sP4xwoJFLj4FKeY46IlRz Ms3oPW2xC6e3RTsd/YWcpl1gXMAtVwwMwsD+1gONydfu4ENSfuB6MQbQTi6o8+QvZRPE NSfOM6aYcb6ryyIHcySwhMsJ+XlaVxTLwDMF53btFnR08aOsQerQDJsEsNkm9VBMysyB hCEhI14v4pqYaXWlYJUjF5lAwM6QSDO/NO8QJFzOZeuPhzZQG9G/aT1GhI+LUzxMP9ys ZkLQ== 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=aYcbaL+XaZ/vNpXjlysNms9CGOZmsuqBpoNcF8yND4RYywqyLzatTfzwcwKFxCzCGb vwb+twXxM3sUz1qZ4oWvQ07RwuWeY/9VY7xSda1wY/YnIve8osSOtA3dFUec2kb+llsK lAT9jNz799RUrXTb9GWfpcSkjm085baI+j52Op6B/AS0KH5KamkazMG0VxV3S+y2KQcQ cr2CbUc5k5E0ZDu7StF7k/TvywcISTu0Z0wAo1xI3Pfa2olhpU+MadS8OGewSuFKlCsw Sda28aJGdh45mv69nDKyS0Fz0MExUPJ6mPY30kyKHXGL3VANMR0g4yl8YFjvz8Iy4NwJ E/vA== 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 2si87510wma.3.2019.03.19.06.37.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 06:37:26 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x2JDbQ8G005884 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Mar 2019 14:37: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 x2JDbPPK023977; Tue, 19 Mar 2019 14:37:25 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v7 2/5] Remove duplicate code from apt-keyring generation Date: Tue, 19 Mar 2019 14:35:20 +0100 Message-Id: <20190319133523.32456-3-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319133523.32456-1-andreas.reichel.ext@siemens.com> References: <20190319133523.32456-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Jds1AJskKhsz 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