From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7130898771096895488 X-Received: by 2002:a17:907:6d11:b0:730:a382:d5ba with SMTP id sa17-20020a1709076d1100b00730a382d5bamr1857692ejc.371.1660291753244; Fri, 12 Aug 2022 01:09:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:26cc:b0:43d:b3c4:cd21 with SMTP id x12-20020a05640226cc00b0043db3c4cd21ls897951edd.2.-pod-prod-gmail; Fri, 12 Aug 2022 01:09:12 -0700 (PDT) X-Google-Smtp-Source: AA6agR5tkRFW2bo2dnxeXUI3W2A6KPHlcnffNwFnejnINb3xYzpdn9zJhiyPmN4Ei1J/uVpHw9UH X-Received: by 2002:a05:6402:3697:b0:443:1c6:acc3 with SMTP id ej23-20020a056402369700b0044301c6acc3mr2575336edb.421.1660291752016; Fri, 12 Aug 2022 01:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660291752; cv=none; d=google.com; s=arc-20160816; b=B3avdzMDGXODbRREc4yiDnbx09K76CjzgFA7MWOWlbQPM01il0dj7TygqqolfKNaL2 gitizmvZQkxkATrxr0TMuusf62WsA/4TWdqmrBCNNQonu8KxoXGGQjtPjIJXyY/51dm5 Gi0nHS04ThvxyyVMOmoRm1RfaWCvRc6GE3qPOBdtHLTOMn7nHTz3XbSJd712rQGZFkJQ rGwxIQigM4q1XVG7uumALJv3OQ3WA7FMtwvVX2cvNpUTnQ9vZqsz5cbTge/u/fROuOr0 6HX6YqwP/pQ2GhReUpv9GPIPKn5enZughELzPHcrr+DehE/e2GPSuiAkM+2fJXoYdlJO 07dA== 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=guv4K8YiS4tS1UjluJTk64LaZVnJcJA94vQcgkWqdTw=; b=mjYZnUJTVSPQNp0d96ijqmWVq6Ta9NweLUdvKwNBb/r6A726nenQuH/aBpJDXac41c 5lD22XxMr+W1Rh7cKWSyyo/gIRkAX82RbsjenVAriP0iFLdbPmKcAx2fZJVnIwfBmyNd lFYokE1QOQAbdeZGxZ3TeDPRcyeIotZxxwYTaUCRyhVvvHE4ZDR/QExYPk3Vke3qLwtw joK70TAUr/ejmEiKV9xpqCCQLFjlBMmqArOCwsMYx0sz6PQAXr31gr2hCuuqPjOHe3dF VBNrpCC4entWBT2lrm0qQMdA2uPwTCTdh5bmnefnHq/jKE/FWUCe89syD79ab1LYHuVG +tzw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AeEBnR0c; spf=pass (google.com: domain of fm-72506-202208120809114c90747dfa9173a634-5tpicn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-202208120809114c90747dfa9173a634-5TPIcN@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id bo20-20020a0564020b3400b0043c90c086d5si63894edb.3.2022.08.12.01.09.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Aug 2022 01:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202208120809114c90747dfa9173a634-5tpicn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AeEBnR0c; spf=pass (google.com: domain of fm-72506-202208120809114c90747dfa9173a634-5tpicn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-202208120809114c90747dfa9173a634-5TPIcN@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202208120809114c90747dfa9173a634 for ; Fri, 12 Aug 2022 10:09:11 +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=guv4K8YiS4tS1UjluJTk64LaZVnJcJA94vQcgkWqdTw=; b=AeEBnR0cm5EmbT3I3UDOic8nuBsD9j4eNyDwKI4mlCaZYHvci0pRrZ4+kgp287gyjtCmQo YPmVmB4EjyKNDG+Ls+71DEZTWFTCFB1xgKvAxGJLkU0TV/+07n+pBYBPAamMHpfja1PcF4s8 b7gSp8fN2qiCSynsf3bcyQ53xgi4o=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: amikan@ilbers.de, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v2 2/2] improve cachability of isar-bootstrap Date: Fri, 12 Aug 2022 10:09:00 +0200 Message-Id: <20220812080900.1601235-3-felix.moessbauer@siemens.com> In-Reply-To: <20220812080900.1601235-1-felix.moessbauer@siemens.com> References: <20220812080900.1601235-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: YmZUS/sIqZ0K 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..fdaad61b 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