From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6654236089293733888 X-Received: by 2002:a17:906:7853:: with SMTP id p19mr138931ejm.1.1549310071517; Mon, 04 Feb 2019 11:54:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:628b:: with SMTP id t11ls3491057ejk.1.gmail; Mon, 04 Feb 2019 11:54:31 -0800 (PST) X-Google-Smtp-Source: AHgI3IZjHZ03i1S27hMJchIpfXf59IXkBKMyoFFiKJGTTyvAwL0/I5SmcqfyIcEasLIhRs6XHU5U X-Received: by 2002:a17:906:1589:: with SMTP id k9mr138134ejd.5.1549310071122; Mon, 04 Feb 2019 11:54:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549310071; cv=none; d=google.com; s=arc-20160816; b=o+i1ETwfN6qURaGdVRvEfFdtHtpZQi00ERfqsBevgNK8Zwi1lGkgSPYDkjaBnVGchg ttxnQGWsRXsxNGqv2lZjpoyIRzXSmVeYj3mWNbiiBhfz2nqnrMkGhcxJrd8sQyXAUxTu ByxPcfN2D7TE70SKKDkHoCyC3AbkUBYjLdxJ2WAnG/aONicF+Q7je/PqvIPpP4HKNce+ IAOOWOujnZQxqFjscxBsFUA8SCQXNXsW7EZ6GheUDnDlxioiIt8SD5gFpktASNhBlAkT VYxo4UmM+j3Wqe7k7W2iWgFJ5Erb+sIgC8KFZPL6VlO3szsNl3E6nPdbgHMUwkeEUZkN m6Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=Z4BkatT1l0cffvoQjmlqjgatGankBU0+mmwhWBLEBgQ=; b=mNEHy7Ctpzp0lnihqR6Ak9372pPcJSw6uilof21UcNm+oN1IddZoY8CZzDOCku41EA x78zp1cXhwLDrAhD5Q7EqaNJ+S29ajljDXaNJPDWc2CU/HTBqdzrLFhB3tRL8W/Bc9SK NCUfZmAL1FwA+q7+0EWjm2wYTVrfQOWsZHaqOWspMuwi1080eJbLV70c720UR65QlbbO uQwYnISe37rfE0QoJ/6KQRL4mKeNL+DSwKs9FsD8LATrU4WKfXKY7CTFdZIGwYtVAorJ DL42qzM7lzXWrHI7WP9zE0YzAwsO5G5C+sNFSU+7wVRiGr+oX3Gm2HdSMHi1j3i0Eckq x08w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id l31si941189edb.5.2019.02.04.11.54.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 11:54:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x14JsKat002778 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 4 Feb 2019 20:54:30 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 1/3] isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS Date: Mon, 4 Feb 2019 19:54:18 +0000 Message-Id: <20190204195420.7972-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190204195420.7972-1-mosipov@ilbers.de> References: <20190204195420.7972-1-mosipov@ilbers.de> X-TUID: ynqqS23wJH47 One may specify the absolute path to locally stored keys in DISTRO_APT_KEYS as file:// Local fetcher module puts the file under ${WORKDIR}/, so gpg in do_generate_keyring() task can't find it. This patch fixes the problem. Signed-off-by: Maxim Yu. Osipov --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 323f7cf..fbe312d 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -37,9 +37,10 @@ python () { distro_apt_keys = d.getVar("DISTRO_APT_KEYS", False) if distro_apt_keys: d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") + wd = d.getVar("WORKDIR", True) for key in distro_apt_keys.split(): url = urlparse(key) - filename = os.path.basename(url.path) + filename = ''.join([wd, url.path]) d.appendVar("SRC_URI", " %s" % key) d.appendVar("APTKEYFILES", " %s" % filename) } -- 2.11.0