From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:ac2:419a:: with SMTP id z26mr846862lfh.2.1551969962802; Thu, 07 Mar 2019 06:46:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:63c4:: with SMTP id s65ls738118lje.12.gmail; Thu, 07 Mar 2019 06:46:02 -0800 (PST) X-Google-Smtp-Source: APXvYqwPv9pJbpo3xHPuDTS/VTffMbrrczr/XQ8pzzH6rZypfPEOEXfCQR5hUd6sXZMK7YUxIJDl X-Received: by 2002:a2e:80c7:: with SMTP id r7mr714399ljg.10.1551969962358; Thu, 07 Mar 2019 06:46:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551969962; cv=none; d=google.com; s=arc-20160816; b=Gkj0wajYYLcGCNxJYs7LjESjiqQgpOJIhCJRMiSqt+aXYSY9K4IohLsbRSrxcDEG2K FMghVXyWIQdaq7Yr1GoXblFsZU/8neLqv1fKwzXPX0eXbIJ9Kpo42rxo/UzKrMolrrp+ LfG3oQsfsUihEhfgsmMvqxCS/bCSrpRTYiJ6CCf8dLaWHzF/yAzcAs5bOydTcjbHzWGA eLga/2+7BHHrHhae2C7X0TJmDdbpT8KXAz7gwpUZc3yd+mfKSNSySFilchU/Q5ai1YnM wxkHQn12ZsiwTQTEe2GZjjV61X4hJJEp1V+/xKs3WvXNwCnQp72G2OVlf/rjLrzdwFD9 5AMQ== 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:subject:cc:to:from:date; bh=C1Qcz/PzMA06fpr2DEmfNmNHwNS8IgPrijyqqnUTq+k=; b=z2GF2I//hZNYcAv3Qq2qGv/zEQHwro1hdB8df0B1LjJDIzDM4sSEuBit43irCfYq5z fQELCl6EZyaHkWE/uoWzE40ITAORrq34/Czdxvlq9C/Oo+IXWW9/SWCgSTtXatme+Km4 Y9DwUGBocCrTsvosUTr4sCe7B3wLaTqqLaDsiqtdCMqQVXU7rOVqqEyjxXiUNlY2tEHc aLpgVV7bSsH75HR7ZX8cICFFTjYOtAr/zwNwedNHeNOwn2nUO4IEB2Kw6z3sRBXaNfRp Kd84HhItcrMZ7Y0j9hG1sG0uvCZ8+gmH7o+vdQLpCCXWDlhPVmaSoe9La12wNe2Po4S4 dDiw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id v27si203930lje.0.2019.03.07.06.46.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 06:46:02 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x27Ek1Yp018317 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Mar 2019 15:46:01 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.211]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x27Ek1eV007973; Thu, 7 Mar 2019 15:46:01 +0100 Date: Thu, 7 Mar 2019 15:46:00 +0100 From: Henning Schild To: "[ext] Andreas J. Reichel" Cc: Subject: Re: [PATCH v4 3/6] Remove duplicate code from apt-keyring generation Message-ID: <20190307154600.6c6f2d5f@md1za8fc.ad001.siemens.net> In-Reply-To: <20190307142304.14508-4-andreas.reichel.ext@siemens.com> References: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> <20190307142304.14508-4-andreas.reichel.ext@siemens.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: PkmAY+/QZiXl Am Thu, 7 Mar 2019 15:23:01 +0100 schrieb "[ext] Andreas J. Reichel" : > 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): Now i get where the duplication came from in the first place. And as said in another thread, we need this here in a central location: DISTRO_APT_KEYS_append = "${BASE_REPO_KEY}" I kind of feel sorry to discover other patch mistakes in reviewing your series .... Henning