From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:a2e:8555:: with SMTP id u21mr1322171ljj.4.1553002647267; Tue, 19 Mar 2019 06:37:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:2c7:: with SMTP id y68ls2536866lje.10.gmail; Tue, 19 Mar 2019 06:37:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqxWxyqkSz83VUKvazHPvz+p3ezBtcBzTbx7oH9jrLEaMQG820NaDlLJtQwp4x8Q6O9+fd7G X-Received: by 2002:a2e:8154:: with SMTP id t20mr1307251ljg.7.1553002646750; Tue, 19 Mar 2019 06:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553002646; cv=none; d=google.com; s=arc-20160816; b=swRkNnFjmmryKSsm3k/CPlv+cosjUw9p1nu5R5B49RJlcHxLdN203I6o7RHDqkzJFe 1WFdmjVew/lUVRvNZDl5MobOlvfc4jxNY1ZNxmlC5hRgQNhAgq0QUsXGJFdWMrvW6NjC 0vrfRB0TPu1JFbf2oLHsMUumLq5mUsestU4+kOY7pw+XQfveZoh0u/G/ZyteT9H7+aJ0 V21R3jtvYaEIyqmDoAYS6O6ncBA9UjdWlQh1K/SqtGXkAjUdEPADpsmhHDjfoetH6eqJ hr0MNwptWkxlcErd0S6dgQw7IoYeHqsKtX5J4wslT5P6dvH7We/oG9gDFUwtzQ07HlYK 9dMQ== 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=LFoTtWX9yunYieEu/q7dfyWa8tMHDgssg5eSlp3e6kpN9ZYEbpZWshlgRr7XoeRCTL 6dkCTyPjGFR0Vsy3/0MHh3/vGQVa5JtpdwLuSBSDmk+X4wLJ7teiq7XdiHr2NjOMqfly swPSCOjjS3Sc+2tdAn7V0DOPwfSqJxjVeFc5KPZyJmL5QMtUoSCh7H51e1OjdKKoXTkC 2eeRzvU8fyYlD+rCicpi76w+7kIRjfEZ0HVP7jSMf7E8TfQnuzpuUa10wwp+zDJ34baI 5lDbyKprQ8kky6s/u0cCuO0UbiB3BOzojY8NzrXT8CST01dlZle+SF7E7ETIKL6uX+qc xHlQ== 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 v19si129135lji.5.2019.03.19.06.37.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 06:37:26 -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 x2JDbPlH005559 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Mar 2019 14:37: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 x2JDbPPJ023977; Tue, 19 Mar 2019 14:37:25 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v7 1/5] Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Date: Tue, 19 Mar 2019 14:35:19 +0100 Message-Id: <20190319133523.32456-2-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319133523.32456-1-andreas.reichel.ext@siemens.com> References: <20190319133523.32456-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: PAvbnc7znRbr 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