From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:adf:eb88:: with SMTP id t8mr1051828wrn.16.1552991430839; Tue, 19 Mar 2019 03:30:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:61c1:: with SMTP id q1ls348424wrv.5.gmail; Tue, 19 Mar 2019 03:30:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYf3jnxrrEIzb88ttOwjS3FsVtyCWC5QrerngjMQlwdg2ObwyyxRSFT3aJcJ0JWAHnt8k0 X-Received: by 2002:adf:dc0c:: with SMTP id t12mr126973wri.15.1552991430280; Tue, 19 Mar 2019 03:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552991430; cv=none; d=google.com; s=arc-20160816; b=cMsOausocMYwVnX7B8C17iVe0NeJEXtkwMwvTW+4S4WyBUZpMYj7J/S6NmbD+sc0nm 3lIVDPdGPCbuqhgcSm8P6GcRK2n5iE/+0VtzZMOJA4LptsoqmEjVEdOJSHzzSswqxpOd RIGx9GZd7DYrMvJpp6XkA4YN88ydJSn/UxGMAYlnOHsuXujdOntL/haHqWBxcaiDY3sd 7arw9ZoYmkygPdY4iyFXwm4eaWnXAUB2SW2wAbw19uZi/i5PcViMAFi6hUpjbhcgS7Ez bhdoD0TI0oVwN/HiqIhTFG975ZmycDMCwHfll59Tjr9OukTLOUTluu1mIwFC8TIsyZOP 5L7w== 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=cFToiiZQHLzcIgnbLjRzFk9dhu76k+Q2ILBkYNTo+6M=; b=OYvUo5tDh3Q93JfCzVU9qTEzwS+jioHDLnJqv59dyvv0OpYfc8onGvYnInQVq6mzEc rpTH8oVVW4hGMwJvN+5KSo+HGyTJE2ho/mye7DRVmNXypMBCxic/vYIvjfPOhab5gvrq Pob0WRfmPMSzmQnACHQCRuJ8B8Gqqx2nzi3keG1ami8DAeCtsdtFESC/1iYI3iShQ0Jd Ppe0kgzFuTskwRmSr4+GFbt7MGpZPwoi/7LIm5x8YNu34mJef714+35W80SQAyIdcUTS MJWZRYmscItfCpBmBuoM0Ndo2g3/gqm5qOPrpGDAKvPfHVCVeCjlIa+tFngQSiQfIplf CBoQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id f6si68214wme.2.2019.03.19.03.30.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 03:30:30 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x2JAUT4j012262 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Mar 2019 11:30:29 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id x2JAUTC2003355; Tue, 19 Mar 2019 11:30:29 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v6 1/5] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Date: Tue, 19 Mar 2019 11:28:20 +0100 Message-Id: <20190319102824.14851-2-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319102824.14851-1-andreas.reichel.ext@siemens.com> References: <20190319102824.14851-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Lq4QDelSyoJw From: Andreas Reichel This reverts commit af983a13b6f4cee5d4af5e5cf6318231e02775c9. This commit broke usage of remote keys, where they usually come from. If fetching "http://example.com/dir1/dir2/key", the file is fetched into the subdir WORKDIR/dir1/dir2/, which breaks with this code. However it succeeds with absolute paths. We do not want to guess where the downloaded file will be. This does not work anymore if the key is downloaded from remote with a URL. Furthermore, a user could specify "subdir" as fetcher parameter or other things, which break this. This is really fixed in a follow-up commit. Signed-off-by: Andreas Reichel --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index c1b571a..2910eea 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -40,8 +40,9 @@ python () { d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") for key in distro_apt_keys.split(): url = urlparse(key) - d.appendVar("SRC_URI", " " + key) - d.appendVar("APTKEYFILES", " " + wd + url.path) + filename = os.path.basename(url.path) + d.appendVar("SRC_URI", " %s" % key) + d.appendVar("APTKEYFILES", " %s" % filename) 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: -- 2.21.0