From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7082705989547327488 X-Received: by 2002:a2e:90ca:0:b0:246:48ce:ba0e with SMTP id o10-20020a2e90ca000000b0024648ceba0emr22272806ljg.401.1649070994465; Mon, 04 Apr 2022 04:16:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls529077lfb.1.gmail; Mon, 04 Apr 2022 04:16:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0YKF+mybwSGlQBY/r2TFpSKCM5Ul3HptnnDDrx0bdDVeKGTF10K9ZbPGJKYgYOFWrJFPf X-Received: by 2002:a05:6512:1504:b0:44b:36e:b50d with SMTP id bq4-20020a056512150400b0044b036eb50dmr3424809lfb.558.1649070993478; Mon, 04 Apr 2022 04:16:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649070993; cv=pass; d=google.com; s=arc-20160816; b=apf8SBqDMsMy46uiF2XfRSwgiUfPx8Sh+MV1meTdIXW1i8KSPOkolTqve+Cp9ebwHO +iVNBUkUKxGnr5Cu1lnxtsZVRUyOgonAOfCDKNSiSKX71IRr8tR9WC4ZwPsbZvQ3HNTN JmOk81ZNSYJWIXP55OeAN0MdcL0v6z4kXYy+pIjOy8yNNWlxpADmsolR1SnRhdARy+mt KqozrjdD5kEC1UCt0OzeQ+MtzvTdBhbjooFce6MW2KPrEYbIhan7gpiFqPJxbIB8Ue8N OUOD3cZqn+9eWqHApWGeGMG/nIyxEl2ZFeijtIqvRXeeOCWvSRfJP7e2UZBtAFl1/L0b K6Lg== ARC-Message-Signature: i=2; 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:dkim-signature; bh=OSaaQ0LpPPQZdDtuPpwPNt+cFBy9nbCp0laEJ3/MYLo=; b=GCsD2CUSx3EYKtNW3qHHmM6c6qeEX9hPIr38QzN8gDiuSe7WgDx346/LwVpSfuopKv XiMUjRoCV5kOIk+ehDBJZyIRZBpJ+uT2gDgg9dEz7uLsTQpaZGgzKoEMfAjV+91XMym1 nV7m2N6tf5Fhu3h40f1+RDPAiaVRnxarUoWKQCidFB15s7LR3DBCKI7eytH5HOiS+Ozk VHvGvE4kcbWVCs6B+Ktf73X4yoIqF5xcuxN92Ge7Ynuk51Kx3rUDeMrBcBKySEhwl9nY VciEdvDFxbbWaAFi6a7Cbg7R7UNuD3UdJZ+XxLwnRG/XgWDgSqk82qI6a4lhOcleWL5X v7cw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MzDuFvMJ; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0d::60a as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on060a.outbound.protection.outlook.com. [2a01:111:f400:fe0d::60a]) by gmr-mx.google.com with ESMTPS id c3-20020a2ea783000000b0024af7c9603fsi510010ljf.4.2022.04.04.04.16.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Apr 2022 04:16:33 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0d::60a as permitted sender) client-ip=2a01:111:f400:fe0d::60a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MzDuFvMJ; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0d::60a as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hrG1MlKPRbX1EAvNhEbFkjAG3WwJDAYLkKFSXlwcIU/EICy0LB22FSCPhWTQSjEHgrjHpeUzqtQDwu0/IhKX6Z+RRUzGe9+SQYOQ0o24UJr7hZS+aMNCRFl636QFb1sux3hr+f/lvIm+FbcgQYTPCBn5k2/koI6VFgdFLorvqM/w1G2Am3cISyy+gwf+h0/ptHm31/kMSWkRvAlSUGSJoASn+Hy1NC32e7zOrn5ZjpV3aaWbeWoqSTVYapxThf8oMTh9NhAYMBhNB9xWdxwM+kDi/uGncIcx0EHsO+vd1GwdKuiUyYGR/b5Hm1sZ/TtEgT5jy7ZXQo8Rnt63vPunng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OSaaQ0LpPPQZdDtuPpwPNt+cFBy9nbCp0laEJ3/MYLo=; b=lbr3HAthNP4YuXaAFnwF3wDVtK/RkOEPbMD/P7ymvtAMfsrVSRgjH5/38lQMm4WJv7erfeTsEfJMkT4FM7dnaaTM4Co2OMPxTDIoPwnta/sJQsCO9HtPhszhZ/i7UtV2UTeWz6YFo63MUZn5WnHWRPvGTscDzY+mhkSf03nnM6PcIjjRYvXaXWw2jV9JNGej0ATWSYaSd+5Z7fTt+ZeDzckv16n6osPodyhvkmbvgeurmj+qeV3LNY+lkasX14FWZaxg6vH28kZu04nVq8gxkUAVXQmICmhYdSQAlrkgaRY75KUiE3JxXU4ibEwWIMJ0QDTQvsBXPZvpCX8DdQTXyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OSaaQ0LpPPQZdDtuPpwPNt+cFBy9nbCp0laEJ3/MYLo=; b=MzDuFvMJJmZDlVhPRJ2atY1VbGhFBh+KyPuROIKqKJTdlGAm6M+u3CzEig0Fi9yNrJTRQz9c1t4rA4ClzVVkYitLNwTwOAluTs5b0DLp3FEKQJ0vsJkvMOdJmr/XeG//3jyDQXrWTlplk342fOnUg2ysVUM16XyqyrZDXRRywgPsdTEcMnU91zkCNn2+m6FpA/eBK3aQUY9mfnq3jopPasSi407wjJlIqivowXb1H6UkcnzaFqKC1dq4EeUdN85fZQCOHG1+cIV2BAdCoMUKzzXMC69oRZCb/RxJONCFzC4OuTvQKsneuW8+yA1QjvCt5s24eF4gC800vFIIzo1yIQ== Received: from DB6P18901CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:4:16::32) by DB6PR1001MB1221.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:b4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Mon, 4 Apr 2022 11:16:31 +0000 Received: from DB5EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:16:cafe::61) by DB6P18901CA0022.outlook.office365.com (2603:10a6:4:16::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31 via Frontend Transport; Mon, 4 Apr 2022 11:16:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by DB5EUR01FT069.mail.protection.outlook.com (10.152.5.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5123.19 via Frontend Transport; Mon, 4 Apr 2022 11:16:31 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 4 Apr 2022 13:16:31 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 4 Apr 2022 13:16:31 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH 3/4] isar-bootstrap: no absolute paths in SRC_URI Date: Mon, 4 Apr 2022 13:16:12 +0200 Message-ID: <20220404111613.2159786-4-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220404111613.2159786-1-adriaan.schmidt@siemens.com> References: <20220404111613.2159786-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: adriaan.schmidt@siemens.com X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 433714e4-8d49-49c2-2a33-08da162c9273 X-MS-TrafficTypeDiagnostic: DB6PR1001MB1221:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VshB3kXHYy25lZrvEphKikl1KAky1gwlrTJnaYh/Ub8mehpbLGFWTD3s3f8UCPNqTSU7PfWjFqbH4XBX3ymuWklLewRzWnPxggzxSX3Igj90+sjht8clVvpLcMJ424fZMAfCSPq3eAFeJD2aJILa4OFiVwRo7Jk37JFAn6jLER7suzB3L3uCSu96X7mZLOeMkMlsKJTFXEWS4p87e230yb9xUg/ncadhWX7BPKrWtoCqu3ZMg272TOZBrZFmLFcdsSrNddAiao0/ZJ8FqF9fLJr6PqydBf6I0DCXnnwO5bkKk2K070Ex0DwRdD93Wt2IAtVVCKjZFNLTXReNVwiRJE3yIgNDR2ZT4at3Nw1O1HfrzNAj3ETHb0ag40+MoQPiVx1UZJPem6Sk0oiqI9N6WbGsEg3sEHSTuqFpfn9L+8tf04j1jpAeBB8m3cOcjVRGdY5sGtqOEbSZoTI+2EXgSe+0aMppus1CmrzqXW38DMcAZxS88EcHowmL/q0eCPWNPyIwJeEbFyiwfpjElj939+Nuo8YEAOpQsnsN5WEb8CVlLNIC2IwG+NIFzEi7uK7kGBp3BfG3kctckhFJmuNCGh9KEvgpc0UjWChedqXvB+6KL74nlm9JI0XtWOxy3ukSLOpaqssf3IzR/FUDaipQmpuqWxlZSflsYmic+XrcK8tg6U0iOohit6gbYOqaHHkxqp3I8x0hnHzsOc8yrBwggQ== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(336012)(81166007)(508600001)(36756003)(82960400001)(6666004)(40460700003)(5660300002)(86362001)(8936002)(36860700001)(26005)(82310400004)(44832011)(316002)(6916009)(956004)(2616005)(107886003)(1076003)(47076005)(16526019)(186003)(70206006)(70586007)(2906002)(356005)(4326008)(83380400001)(8676002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2022 11:16:31.7000 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 433714e4-8d49-49c2-2a33-08da162c9273 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR1001MB1221 X-TUID: ObKjxI+/XpvS Having absolute paths in SRC_URI breaks sstate caching. So we don't use resolve_file (which searches BBPATH and returns an absolute path), but instead append the search path to FILESEXTRAPATHS and let the fetcher find the files. Note that there is no risk of finding/caching the wrong file, as in addition to the path in SRC_URI, also the file contents are hashed. Signed-off-by: Adriaan Schmidt --- 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 a6e370e3..145d5e87 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -29,6 +29,7 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = "${@https_support(d)}" DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" +FILESEXTRAPATHS_append = ":${BBPATH}" inherit deb-dl-dir @@ -60,11 +61,11 @@ python () { distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or "" for file in distro_apt_sources.split(): - d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) + d.appendVar("SRC_URI", " file://%s" % file) distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) or "" for file in distro_apt_preferences.split(): - d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) + d.appendVar("SRC_URI", " file://%s" % file) } def aggregate_files(d, file_list, file_out): -- 2.30.2