From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:a1c:f61a:: with SMTP id w26mr3082578wmc.70.1553181447381; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2257:: with SMTP id a23ls866423wmm.12.gmail; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzvfqW/xW1RIOSf+JZTDi6ogmHc9b+jRirB1oobOlGvjFQZmiAdJ8dDWlmGGErcS1I/mAB X-Received: by 2002:a1c:ab88:: with SMTP id u130mr2889046wme.148.1553181446929; Thu, 21 Mar 2019 08:17:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553181446; cv=none; d=google.com; s=arc-20160816; b=P7kL1DzxYdX1BKBs7MDNdwQkBXn8S9h5cNvWQsSTNh5WTvaxT2rK6N9yH9Jy+Oucn8 KLjFtThWYgH+r2hf5YsXRRYb0I2iJdXQtgHbs/SicQtBD0ILSmGXOZH83QvGM114zuHN us9ggF763NUDJEgnnV/Z+Z1cYt27HgqXHIMnoSHTk1CTORZJwOk0I7+OpCPCizbJEg4Q CIoHbHMJ8u3u9AeV9N4kN50Vv78c0RpVZWLaYyrRkpHoCXgk3LO1e43Wm+9dXx2FmzkM OsOkanai82xzOShfumo4UKh2mVtIbf5QpZ3P44ZkJGHyVmBe4axCedtYizB8pmxVuRau m6og== 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=EAfuXfeBaAjw+Oi5MkRnHG7Aulc5ISX/2UY9XDdIMItPCTXfAJORnlJeFozTH7PVJ3 lrlP3olLpuQxcRyI3PP9KaOIF+elTxUlF+N69OZmRJ0I3IOPJr0HCWj1KfotCcQ0ypNg wTlXDVE2QcXyV7vd6qA5MWvjjC5OiZDiLJYvH4MpzBEvt2LBNSfUezX3P9F5hXKand8s bfm0rk83OTHa91buioOzZtXs7HdhOTywtyCZPJCiDiQ8qMpghBEu/AXLKf4pLvbTcXOV QeicWnl6s3W3TIWC/wtHQjGhEqisleVxe6+jfWPfloa4J/Aq1flPzGa9Ij2oKI4wH3WP U/BA== 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 m1si224568wrj.4.2019.03.21.08.17.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 08:17:26 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x2LFHQ1N007870 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 21 Mar 2019 16:17: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 x2LFHQM4013389; Thu, 21 Mar 2019 16:17:26 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v8 1/7] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Date: Thu, 21 Mar 2019 16:15:20 +0100 Message-Id: <20190321151526.12001-2-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> References: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: zvC7w0E7o3Qv 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