From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723623254654976 X-Received: by 2002:a5d:400b:: with SMTP id n11mr738307wrp.7.1552916044822; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:96c9:: with SMTP id y192ls627102wmd.5.canary-gmail; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYXzuDNNaoYv7+o2+04hqNIz02YNlDQRlKnji4z08D5On5/T9UMuBvhBak1vDU5sLMsFwE X-Received: by 2002:a1c:cf48:: with SMTP id f69mr1106668wmg.13.1552916044362; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552916044; cv=none; d=google.com; s=arc-20160816; b=U4ps7TjdUEYvnGm7OY3i5Ob//C879N/u3KbEpV38vvrcp4p2EclyQ9Y2vL6iATjDZ9 YuynHu6vyVM5OVXXnUqBfawN8Xi4x91YdQFar814Q8SuVLCDXfL5Ge/L/ZeyO+PEzhQS TqKB3OjOB+9nsEvk+ljbWqKoX7Gw54PrNcaXlaCUZjbYgvfOJgnl/pMq5chVNSr9megv V+jlPIe24QC0felAoYhnuysIl5lDh7LSBEPbEXvR79k9iOKYRfxOL1OUxeoxsuyLhPZn nKmSNDl7pS/N4LQdQRvBp8WSfYXKdEUyhM6uzfbce6u1CV5XoeuZR6xZkrtghmGut8gF ldVQ== 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=KCFpHYpAo4sNj5go7RzUaWZxsNcHjzyGHIz+z79YO/OT8zuJHD1BvmYX7mJw7qXQjN h+45AK00t1lFMtLYwlznMiTTD0Y5+cfMl+x1yNNwZnqTDlT99en0U9PNxfAQL3ecFA+1 k2gbvgTxbpcLXVakGuxcswqb4j8Cb8i5SChJAbNiMqzrKezwhUwFIQFMpqYMaCXfzpkf mx524EmyARirR/ElZonfe3Ym7o9kF/Dx0D0is/rCfedXuysikAzE2+wEkyLW+s/9xj4G ZgeSML8s7WeJJ51phjXrIiwgFf47fHEmw6ip15fgQnSvkrZEBc7iCAcds94UHV9YgiW+ 9RHg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id y84si498399wmd.0.2019.03.18.06.34.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 06:34:04 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x2IDY3dr032406 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 18 Mar 2019 14:34:04 +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 x2IDY3t6014851; Mon, 18 Mar 2019 14:34:03 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v5 1/5] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Date: Mon, 18 Mar 2019 14:32:00 +0100 Message-Id: <20190318133205.29705-2-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318133205.29705-1-andreas.reichel.ext@siemens.com> References: <20190318133205.29705-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: xgNwQkqC0zVp 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