From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7129878012169814016 X-Received: by 2002:a1c:e916:0:b0:3a4:f29b:2eb8 with SMTP id q22-20020a1ce916000000b003a4f29b2eb8mr20157287wmc.173.1660054087780; Tue, 09 Aug 2022 07:08:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5234:0:b0:221:24a2:5cf with SMTP id i20-20020a5d5234000000b0022124a205cfls5205573wra.0.-pod-prod-gmail; Tue, 09 Aug 2022 07:08:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR5CiluqylQ5COCirsrhDt7TniiRE8ePXdOhjpcXrR9NAOrLFygw/n31E5HAxWRcenXxTNXA X-Received: by 2002:adf:e10a:0:b0:21e:47f4:6a51 with SMTP id t10-20020adfe10a000000b0021e47f46a51mr15078564wrz.276.1660054086381; Tue, 09 Aug 2022 07:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660054086; cv=none; d=google.com; s=arc-20160816; b=edcp+Mfjw/9lo8MXm/6RIF4QsoUOsM5XxSsrLJUiqYkw+PFagnoC6SvIQTf5B+JX6j s98MXU9BtzqlOQgGefh+N8Ac59f4D0PY3UgNfZx6gA0ok9a5vAb0keOFSx8QRXBtiiuV Pd0feicobU4zBQCzh1dQGc+9H9iZy6rJ7kqLijmHDbR9B8EKuhYlBZKyWrWNjoomB/Lf 5BntylH9MaUXs6XTJbmMZYLX0z6twVXIhUprmYsV7lHYv6SaHwGcXnM80rUNQ56F/rlT E9wWYFcOpJayB8W8PVf6kacbE7KcZzVogWxU+8PiRzhArwbPzyuJkvnVaF+3IVZOqJ+P PrEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=idmDJ89V9QzpG7reh6ofaNCEVbsaNqTxZ8QJsg/aC4k=; b=Dp+uDEcPZ2HUMMpXUOVU1GPkCO95PUiLuoXynXFwyoZcrni3oWtvby/9A3lRlj7A9g 9MqNHvdYoDhTCKbkIXQMyoBorpaoAh5WbDzbikon8jGeh0wxXGkqr2HdENQ0fn+CaqV7 KiK3DeMWiDZlbMk/slc9vffexd5fJ5cVVZkSeKT0IGuDXeKDp3X1DES0btFbfrNKDyMw szhOJ4wnHNYK3/CYMa7jqKwSlEUM+JXJYXpBViyjEWxK+G+c17iAMyfMhxp19BmD22XO nX2kjUzW0Asgf1VCko6wcnmWhcAf4GuRpbTOpn3BYaWLilphu8ON1GWK6mfSk1IE0MWr 2tnQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=GcNXJq8w; spf=pass (google.com: domain of fm-72506-20220809140805308a7a0538611417cb-rt5tlt@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20220809140805308a7a0538611417cb-rT5tLt@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id u11-20020a056000038b00b0022068e0dba1si474804wrf.4.2022.08.09.07.08.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Aug 2022 07:08:06 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220809140805308a7a0538611417cb-rt5tlt@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=GcNXJq8w; spf=pass (google.com: domain of fm-72506-20220809140805308a7a0538611417cb-rt5tlt@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20220809140805308a7a0538611417cb-rT5tLt@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20220809140805308a7a0538611417cb for ; Tue, 09 Aug 2022 16:08:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=idmDJ89V9QzpG7reh6ofaNCEVbsaNqTxZ8QJsg/aC4k=; b=GcNXJq8w0IYriTUL4Gw6nbXs44rTcOyscwc7zM1j/linKfqfX40/rFz+96iCKu2eBXZoZg orFOJNOChnhOrqltWAFl/XQZpkKUeLC0AQ14p5Wsa0QDfPcDskb5Sf1K2LV3xS1OwkdTBwVc NOzygw36EdCNAxLkGanupZiuDkOac=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH 2/2] improve cachability of isar-bootstrap Date: Tue, 9 Aug 2022 16:07:56 +0200 Message-Id: <20220809140756.1164520-2-felix.moessbauer@siemens.com> In-Reply-To: <20220809140756.1164520-1-felix.moessbauer@siemens.com> References: <20220809140756.1164520-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: k98ptBIK62EX 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(): -- 2.30.2