From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:ac2:554f:: with SMTP id l15mr834263lfk.16.1551968713857; Thu, 07 Mar 2019 06:25:13 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5551:: with SMTP id j78ls731228ljb.11.gmail; Thu, 07 Mar 2019 06:25:13 -0800 (PST) X-Google-Smtp-Source: APXvYqySQ6lVA4ksS48MwvuxxQq0ysQSYQnUGz3ADqXYGvvZ13jZcWLTEo3uGtlVQpt/Dud2iFaz X-Received: by 2002:a2e:9ac9:: with SMTP id p9mr696461ljj.13.1551968713347; Thu, 07 Mar 2019 06:25:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551968713; cv=none; d=google.com; s=arc-20160816; b=MSViN0PiSRYu8fTK0l8YnyOMyyapgaqi/+5Zupih6dYWByZ488Ue4VBmVs8mXKFcwC a+AVlj/6eCVsMO95RRi4UVw52Q5Y+5+QE+h0mPfdCiVzAFlq5ennxxPX/Y/sD8vFNLTM 9FYOq3nZzDBu8UgBXDkkIHH/EcT1r4JniXHA/8SdJknK5KBzCO/hS2hfQWBThQ6yx3N3 gvuJpkvXKmVHJouIbjBSshm2p1lQzgvwKc+f0e208JRdDytpdnFAv6UfnsIe2uXdzlgW mUZuLO5ECQykV75zUY6FGflgfv8h2RzAP9LsCBE0nxlf1DZGJQF6i3bMHlsYxBB4LU/n bQUQ== 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=LGcGt6Aoe3AnW9xco88C7sObbdXK0iLZpdHtpcZwuzk=; b=hhUnX76sLrnOKc3pjMwO7J76jXjyqQ1etAcyVbXvQEZGIezESBRWUVMm7Dvt6daX7p bJQ+gmoTXs/dUUqARNGvAxvIeQAjqJTyUTb9Ug1iVTEJQPcdgw9mwqb7M8AagciTaUgN cBEipAypcv9K7upKBkAMfel7xjXU50miPWJTnGhOfrXcMIkpnM0VJFd1ZTupxFXZabpE Q+Q0S/rnNF7M1VvUgJzJVygvC0VY0suATojSbb/957vBICPCUDcORZJUi2HOrkI08qO2 nrHgcVA4VVs2HsakxUP3AtigPXerZbkIcHl85rlKtJyy8EoDEpkVbnVZ64q5aKUhftEl IGQg== 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 m16si174267lfl.0.2019.03.07.06.25.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 06:25:13 -0800 (PST) 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 x27EP9d4007551 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Mar 2019 15:25:10 +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 x27EP9RH020333; Thu, 7 Mar 2019 15:25:09 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v4 2/6] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Date: Thu, 7 Mar 2019 15:23:00 +0100 Message-Id: <20190307142304.14508-3-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> References: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: tmQQOkbzdQIJ 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 9c82184..9506741 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -40,7 +40,7 @@ python () { d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") for key in distro_apt_keys.split(): url = urlparse(key) - filename = ''.join([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')): -- 2.21.0