From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7082705989547327488 X-Received: by 2002:a67:c28c:0:b0:328:f05:46b8 with SMTP id k12-20020a67c28c000000b003280f0546b8mr8395365vsj.53.1649765313605; Tue, 12 Apr 2022 05:08:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6122:17a5:b0:345:c101:230e with SMTP id o37-20020a05612217a500b00345c101230els1672284vkf.2.gmail; Tue, 12 Apr 2022 05:08:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiai/mt5e9wu+KfxiLy2CUyI6px63H3j3sp0exO6HW82krdotEEnYV/hG+zcovh50UuMUZ X-Received: by 2002:a05:6122:219e:b0:345:c57d:4c55 with SMTP id j30-20020a056122219e00b00345c57d4c55mr2196717vkd.26.1649765313065; Tue, 12 Apr 2022 05:08:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649765313; cv=pass; d=google.com; s=arc-20160816; b=TtaOim2A+ab5T/dA2RwB+BYx3RQPLOVE97ALtl1BB8MX+8ofPsRaKnkMhWOe0o+wPX atgVjBrhLRPlF2HPr0YmbOK+3brlAIZoaBEQ4/y68RYMCL//WgolAD/Lr8+nPc12BhqD SL1rxqDLZ2WiChArLBAQ+UgH220rFs4u0eS/lCBXzG6cDl+xcmlJNouTR4UFfT3olecy k6DAHw/VUv+TXJO1RQuhjCR9Ds2o2xwzpOTPUE8ZDA5UDRCJQyFWKiIaxq+KDtv0Mtq3 G/DJqco5BEKcsJ6k6DE4rygWTqO3/G9Ql0zgu5XYzPo4hx1FMRv/TYLcn1G+Zq8nqDVf DL1A== 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=HsboOY3E+JG5aKYliB+9nqxYzKpBFBBVyE9zg+3ABSDDE0jkE4nBpvol4gIOyf9L36 elf3dVvSkXc/sAxDIy9wYDsQYhz98ZdONmEakJZTmcqCRzZw1bViEyNTSD1LWdYBcWgv VWXUsmc55BSJuQfnFCVtHck4Jk5YoH9rmrl1ruIjYcn4CP/SPOCrBV2AAYMzFFzE/LQK DDwvTN2m0Y4T6KVO09tWxGFjV0IDJ1VmivNRZAWJFMivSAd2H3uGSweEhK9TqmKX2OJA 1SFXFh81j3Ygm3cIrw6rf8FNmHAjYhKfPuiqpkMGU842ea74y5C7SUwx+WPdj6UpRu66 hHdA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xs+FR3Td; 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:fe06::629 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 EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0629.outbound.protection.outlook.com. [2a01:111:f400:fe06::629]) by gmr-mx.google.com with ESMTPS id k13-20020a056102116d00b00324c0eb5d57si1187387vsg.1.2022.04.12.05.08.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Apr 2022 05:08:32 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe06::629 as permitted sender) client-ip=2a01:111:f400:fe06::629; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xs+FR3Td; 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:fe06::629 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=VI7WPg6oc4n860D0Bbj0Q5f0P6Zs/XBxZ82MBpy7ULqdkxf9b6oXiZMR8OhbESTmqaccuHbumNZVY2dN+dXUcjZMR8/9++99sa60DU1n1Af4YQT2SKbsoJpx/CLkluQCixnBtzNG1gwMq+fywBNOXOf4hE0DpM34Ac+8wfAggyaYCjYhxZFOjGIjgJOe1mO4+zW2EUc55Uwb0GX5kU+JHpjuMGszJemfNxH5ROFM9+L3t7ehfVIIZtgr5ul05WqpBpEbKXhAU5apgo6oJ52CUaRGmi4fXhkrBMeXsdyh8NOYquY+/7El+04nDdyfWHdzlluP6UwGD1qisL9EHKY8oQ== 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=H4mqZ9PH2gEFsh9dHXZTn7n5QDfYhFVoE22aet06fIeP+Yedq4wI5PsuFYDGdgyevONUEHkg/NtshaO21ZkvHvNex/sLa42YSf/1HdNLJZsZdjiz+5W7VJaLB/bZyMonBaKFydkrc0rxc9UI0LwEODtoeKZR8qBSp1apn1NI5crlnAaqFNKnkJg5Y62rSLz8W4L7XXoGPdfj4hTeAGQhRm14LzHi6VZovcVgeGjfSU0AcznALOP5oJKfr5uSmwo1psgLIOSeNFeqQn1AI6cdwD643SsiDIvi3Y3BCd9hBOMEPpBYO6wsRhsoj6RSjfdFBntZiQsjFwLCrKWWzethBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=xs+FR3TdPBBRJyIiDvZfjH5KZMxUDgmDdOjtW79X62YsP8OkDzIhwG7KTOzgzsZVCiIsVIvtQ1XIaHc0o1QbEK7ZImu++eI5BDoAPBo4M+W25sPMzmOOKMlWdr+qHrCwO89b2sA+TYGKfZcfMyryhtGQMPdjIjHvHYZ4fMxpQaggPvEDJmV+lz5m3yRZxGa0hwZdbBzk8KM8tftH/Zcwlwlr3F5iBSiSi1Ep0D8XtfygrDYoO0SqfFqXT43LWK6UDQ5PMPbMaNDQYOcNW4xfpWz2ccMSRSbVMRMUY/BQ+6qtNy3nwvXiGz5Vv50xWCU+GVORmIOv2wVzq7sxTCYiaQ== Received: from DU2P250CA0028.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:231::33) by AM5PR10MB1745.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:1c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Tue, 12 Apr 2022 12:08:29 +0000 Received: from DB5EUR01FT106.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:231:cafe::a7) by DU2P250CA0028.outlook.office365.com (2603:10a6:10:231::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29 via Frontend Transport; Tue, 12 Apr 2022 12:08:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by DB5EUR01FT106.mail.protection.outlook.com (10.152.4.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5144.20 via Frontend Transport; Tue, 12 Apr 2022 12:08:29 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Apr 2022 14:08:28 +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; Tue, 12 Apr 2022 14:08:28 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 3/4] isar-bootstrap: no absolute paths in SRC_URI Date: Tue, 12 Apr 2022 14:08:12 +0200 Message-ID: <20220412120813.467516-4-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220412120813.467516-1-adriaan.schmidt@siemens.com> References: <20220412120813.467516-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: 5fee7a06-9197-4c54-0dab-08da1c7d2826 X-MS-TrafficTypeDiagnostic: AM5PR10MB1745: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: j46SIdynM3AwTOwxE5iTpUNtowXlPj1D+ls+8suAiEaMTIOVQ3aSEzMlnFPbLZG+1d8Ajbo5Hn3H5M3tCrsYvF6hKIMIhiJg2zmPzyEGRIXxBVEdZLI1V392Ztcv94Kx1YwZuxK3fKANU9he6VR2n+2xPvCiqOfiHa4AOZYKe+ki/DtWQJA/4GCsGMs9wWhoMbcWctsOzRKLIbYFG/N309ZfQBN07XMUWgYLNp5FEO0bxOAXAni1aK4azuV8eWIhrPoGkL/o7eqpfLy6IYpvtq6SWlAJRgiNXBTykIaHJWGGj2CR5gl0AVwII8wZh+5WL0EB8Zbb3agBSoBo5yVfhEu1v7GZbOcZeZ+Y6Z35nwjY/eVmJK8R6+2uAjCT+Ej4t+OzVdzmXzblZrrtshxYSRS9gRAMu4TX/utmRIyMS8bFTbMX/tno+Gtv+ecMR2HkPn6xYfXWwlnYudQsliE1yX7IFGhI9/FybhU0MejYRKWPCw3+pO8WG8ai+sdjaFAVjxL0QWZ3OeimlKxBU7EbP66kCDfenAtsx+RanomB/qWLZ2IfGOPum7UmMpi7eHVzxkutlRRtYsNaiNV2eyQ84z59ca4oTZbgE684R2zaBQtsaNWOSgdCPgG+fPSzYEZqsdaOhtWK/BLNkCUbUwaMa6zZ1nUr4+3Ir/vXaBIH1pqWVkTbWDRwft11Dldtg2rw X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(40460700003)(47076005)(956004)(107886003)(36860700001)(2616005)(86362001)(36756003)(8936002)(83380400001)(26005)(336012)(2906002)(186003)(8676002)(70586007)(5660300002)(6916009)(70206006)(44832011)(82310400005)(7596003)(498600001)(16526019)(82960400001)(7636003)(356005)(6666004)(1076003)(4326008);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 12:08:29.5793 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5fee7a06-9197-4c54-0dab-08da1c7d2826 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT106.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR10MB1745 X-TUID: bagQohumjPpj 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