From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7129878012169814016 X-Received: by 2002:a25:249:0:b0:671:874d:865b with SMTP id 70-20020a250249000000b00671874d865bmr2480090ybc.32.1660289415643; Fri, 12 Aug 2022 00:30:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:a223:0:b0:67c:3fe6:16c4 with SMTP id b32-20020a25a223000000b0067c3fe616c4ls2333857ybi.4.-pod-prod-gmail; Fri, 12 Aug 2022 00:30:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR4NBq6sadfow9FPDo2AhadJATT5soNMIZHaYIvp9wM9xHEFdyFbNOq3k9VKwcGSEYNjJYox X-Received: by 2002:a25:84c3:0:b0:67c:2234:2dee with SMTP id x3-20020a2584c3000000b0067c22342deemr2351077ybm.187.1660289414996; Fri, 12 Aug 2022 00:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660289414; cv=none; d=google.com; s=arc-20160816; b=OdRQqgRSRcrsz5MXOGsaBS4sLWh+kDeDmfaEKeCDI6ku0YYyfYzs7XEe1OQ8AY2els 3ko1n8jzvP5q9Ts5+Hy+emTW9wizKdUUju2ri27O3Xqk4tdx35PJ3ZDM8mrORjakJAn6 BbILHY3Dnm6H8rm/OkpZhff8G8n0tq2T8XSLLifO3aa6D1YQvqzh/F3loyoXq6ZjeDxv FoCCAyl3/i5Z/UaXvkgESrxjagPAxLaTVquesFZx5AkcwSSxpCjKR9XIYbFQ9lh1cYL6 DBJDI+Y5t3yPMpKXs7b51vpLXi0MLIU9lUch3KYDE+sb9aOMy/TVMdShGs6msXB7CbcJ Lwbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id; bh=7lYbMHVFmhZu5uKudZ0/3j5WhwV9lWmHGQuyiczS7Ac=; b=c55M6MMBRth1zOP4bpH4TZAhiWvqhBcb0o3NvZr0nhL7O1Cixt+wD8ql8whk8d/r9K ONfDzyUxwXe7fZr2EL5LXwWTkuBxwpCz+GHcvHfVyN032Ue2IDfzQ4F23apCLGNWgRkP 1lb2qmUEudPjDVvczUZ/ixa/fhb2BV+KDifflRkfYodKLkWLGbTq94uHWKWsqDkMNckk 5JnfiqxBYzfQv12cMCc4UfEqh3DLDu/dYfO2WLNEctKdKIelbe2QRs1mWIV/SngeDIaf p6MwmY7OusOOxpnGkSIGeBhaMybhOp0ZyrgtWpwCe1pjULkLYYDfPw3JhhmXQupunQtw +Aug== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id k13-20020a25c60d000000b00672f915ff85si82001ybf.1.2022.08.12.00.30.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Aug 2022 00:30:14 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 27C7UAdT009030 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 Aug 2022 09:30:12 +0200 Message-ID: <41f3d8c7-9737-ec9a-591d-d6d6012251be@ilbers.de> Date: Fri, 12 Aug 2022 10:30:10 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH 2/2] improve cachability of isar-bootstrap Content-Language: en-US To: Felix Moessbauer , isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com References: <20220809140756.1164520-1-felix.moessbauer@siemens.com> <20220809140756.1164520-2-felix.moessbauer@siemens.com> From: Anton Mikanovich In-Reply-To: <20220809140756.1164520-2-felix.moessbauer@siemens.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: ZdTwZX2mW9fN 09.08.2022 17:07, Felix Moessbauer wrote: > This patch makes all paths used in the bootstrapping relative > to TOPDIR to be able to cache the isar-bootstrap task. > > Signed-off-by: Felix Moessbauer > --- > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > index 604cd24c..9f512032 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -35,8 +35,8 @@ inherit deb-dl-dir > > python () { > distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split() > - > third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS") or "").split() > + topdir = d.getVar("TOPDIR", True) > > # The cached repo key can be both for bootstrapping and apt package > # installation afterwards. However, debootstrap will include the key into > @@ -50,14 +50,14 @@ python () { > for key in distro_bootstrap_keys: > d.appendVar("SRC_URI", " %s" % key) > fetcher = bb.fetch2.Fetch([key], d) > - filename = fetcher.localpath(key) > - d.appendVar("DISTRO_BOOTSTRAP_KEYFILES", " %s" % filename) > + filename = os.path.relpath(fetcher.localpath(key), topdir) > + d.appendVar("DISTRO_BOOTSTRAP_KEYFILES", "${TOPDIR}/%s" % filename) > > for key in third_party_apt_keys: > d.appendVar("SRC_URI", " %s" % key) > fetcher = bb.fetch2.Fetch([key], d) > - filename = fetcher.localpath(key) > - d.appendVar("THIRD_PARTY_APT_KEYFILES", " %s" % filename) > + filename = os.path.relpath(fetcher.localpath(key), topdir) > + d.appendVar("THIRD_PARTY_APT_KEYFILES", " ${TOPDIR}/%s" % filename) > > distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or "" > for file in distro_apt_sources.split(): Hello Felix, This patch brakes keys management in some cases: $ bitbake -c do_generate_keyrings mc:qemuriscv64-sid-ports:isar-bootstrap-target ... | gpg: can't open '/home/amikan/isar/build/../../downloads/archive_2022.key/home/amikan/isar/build/../../downloads/archive_2023.key': Not a directory There can be more then one keyfile just like qemuriscv64 has. P.S. qemuriscv64-sid-ports target is not fully buildable currently even on the latest next, we are working on it already.