From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7082705989547327488 X-Received: by 2002:a05:6000:1848:b0:204:e90:cb55 with SMTP id c8-20020a056000184800b002040e90cb55mr16695790wri.58.1649070993963; Mon, 04 Apr 2022 04:16:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3c99:b0:38c:ba37:2f74 with SMTP id bg25-20020a05600c3c9900b0038cba372f74ls4950105wmb.0.canary-gmail; Mon, 04 Apr 2022 04:16:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAkOu+RwiK4ETI18kP8LsntxCaFBVKyTEpdSJCnE3MsC0pKZT+5Ma1gTCCdhBXNFdZGsaX X-Received: by 2002:a05:600c:2041:b0:38e:7627:e9b3 with SMTP id p1-20020a05600c204100b0038e7627e9b3mr1626839wmg.76.1649070993132; 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=YeZKYf391d8kwdQbLs0FQEKYdxvM01ZWh25QEP2P1cHvz+ivac7BpcHvC0TRiew6YN xgGdMx5zlk0uJQgjAeZFgCUH9/EeG/OpJdC+wUCWItHiGfCmDpGWdU5GvZDiysPyyt6Z g+gmZGM3hHElyi7EWT0Luh7L2FTrUosVzBFUKSYt+lClQhc8lfA9rlv0ifE+hO76Hg6A CsaNwQc7guJfsrGB9tXmtUiVytVOkrWhwYbzBYB6/5OUF3Rwnehd1fYLQyYXHbMf+RPR BzK9RohNE6gu7qx7Doh/3dfp3Q4LAGjDawVwXGH7nGy8z2RLlBa/YxKfKln0m9LSwjhx xrzg== 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=8/6Kk4+1M5IBb0uGsMLDQ7+HBSrOY+UP2b7IZNo4R5g=; b=ntrN0Bs/UGE+w0ywnCXhmBkTM9nbbV3NY50jYApkpJHGTsJubOkeYDCb7GxjT7I+pz gpuJe3+XkPlxLrrOwTiZrp3k9h6R0rz94ueJHTgOr5NhZms/CNpae//hgJMOvk8PiAoU 2w8qv9MZUsKZ0kN5DHmqwTpq7D8KibHryp3HsdMrg+ezVhmbLszpQ1dDEk4ENwUuS4SA UWjbIZzXYfrk7ryBKkFKv5kvlBIHZvdf6HskbivaIxqmGHUdvz4R6a7XEmhpd2j69MU4 DdLQWFR+KlmMnJhEwX9H1nyjqhEeOch9456QwQQ+zOfFiXUD0f+92WJbKhwSdsTmPb0M UZjQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=0J7kwqWc; 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::628 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-ve1eur02on0628.outbound.protection.outlook.com. [2a01:111:f400:fe06::628]) by gmr-mx.google.com with ESMTPS id az38-20020a05600c602600b0038e70fa4e56si145641wmb.3.2022.04.04.04.16.32 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:fe06::628 as permitted sender) client-ip=2a01:111:f400:fe06::628; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=0J7kwqWc; 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::628 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=FbtYtNqV5MsCdDcODQFaMtj3ZOrGdxKbZRTXAF+6l9mnbjHGTWNHCxI2dUKyM5htFgxwk0CkImYZXcx+s4cYboFa7YVzyN2g4+RKaB1XKZ+/b27S+Zia1d5MCMZ2jDut7cxJsTOmmcavFM1/dZ8lw2o15NtOUKF9W3GkkFo7aVYgawAl2/97PCDaO4uBiyGQbmQtszpdQK1glA8GNdNRwhVs3j71SIJzaHISpi/c+FCYP4tf+DI14Yoi09mv9A6pGr9gK9MWInAB9iKTDAf/CaXuhTMQVJUVLa4PknPpH/R/ee+Nyg+tjOhAbjPnNODfVeVJ02OiPu0zeUFdIWo9pQ== 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=8/6Kk4+1M5IBb0uGsMLDQ7+HBSrOY+UP2b7IZNo4R5g=; b=bNHna30jkrGs/ByG/eOPXaePX20Xm86aLkSO6TNhe8PzE9pQZOSOaE34y5Y6GGO0Ni/mppU6Ww29WNYz0T034ATjQ8HCTmf9yDKMC4J0r2hnVohhdpbKN+0exFyg6Lb6bzjvugQ2FzIBKqKe8R92UTWXx5JTKvB9yODVVPbAJR2xX9hKhqNobKARpscz1LHUP8j+sYaR318vt14qu898rXs+45aAFMrf4jrMBH4Exo9HmWlKMZYEfTV1UtcOXBDx0Bxv+y1L7CnTTnFDnDUQttNe1RIHeJOM3wJ4cJW5YMqobF1D17Yytx7Qkqj/AEkhMEmFelQA16Z9N/EXwkCHLg== 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=8/6Kk4+1M5IBb0uGsMLDQ7+HBSrOY+UP2b7IZNo4R5g=; b=0J7kwqWcBtYddIfAORB+TAyT27Adyb6aEQRnihSc7OEFPrjCgsCPen0OcD3kF7ClXA5+PZucMsCWV/0AgKmHXSL1RUGQHHsqVYcYQjRasJda+Cu2RB7Tkbqc8bOlHEKv+nR5Tc2QaeVyR+l/ka0eBBcqPrDyRa97oja1AlbBGwmxyqGKWRGTp2TNl4yvATLpzZl5URqcDUoW2K1N9BpRvMnTjw5Sd57tdUFBJY0ug0GFtZ0qfxDvRvM3QXGNS7WCYWvpATJLyeU0m3BCjXw8xx0ItdUmSIj++ZSqylLQl5j298mQUiGvUJbQVnaEbZBxhUM+ZR5OhnsdoWwlNR1SHA== Received: from DB6P18901CA0012.EURP189.PROD.OUTLOOK.COM (2603:10a6:4:16::22) by DB9PR10MB5740.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:2ef::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Mon, 4 Apr 2022 11:16:32 +0000 Received: from DB5EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:16:cafe::a1) by DB6P18901CA0012.outlook.office365.com (2603:10a6:4:16::22) 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:32 +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:32 +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 4/4] base.bbclass: don't pass absolute paths to root_cleandirs Date: Mon, 4 Apr 2022 13:16:13 +0200 Message-ID: <20220404111613.2159786-5-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: eb500352-ffbb-4fba-9989-08da162c92ab X-MS-TrafficTypeDiagnostic: DB9PR10MB5740: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: y/XgH+9ecy+wOotRVTt6fSE+vIF5UKAaIQIGgxPbNHmzd49oW7y5uCEFqs9y5YdYSMOpiP+uw1HZw2TGhLoIvYan6uQN9er+Ui2EX67SVDg+uquv5yfgUKyhntJ3CDcJHXmXQMOAy0RIkHO3QBZTskjaHHfk0zPf2uOIZ/KIX7IgYI+UIA68ZwAQcb6N+gmTl2nX65EjWADIE62vWL4/74RCpJe1HcRr3k9LeGPnYdwVt3mvCckpZ6/jY8KBTokElkYglQGqpdkYWIxgtsv3AzISLBi12FObSR/LzMdKYJYsGVOxMhqcNRDdZin0GbjTkF7UMk8xH5SMy++VldTKgl2o6YYv7ifix5KCLr71yowzhbkrqMNteywXDQmzGkriYY3fCCu72dDj1iFVpdQGwH2kypnkMm3ANW++mn7wumePl/hlqT/I+TUFNAPUFaq9EnlNL9mEtIrVdVvHJ5DNmE5yElRzvUp+yh7AVrIMmJeMzwHEWQlH3Oxse0X6hp5a9eucpIJQUeNdv04S3MHs7w4HxGdV218WaHLTMF/s9cBLdQl3KnrJiFsT/n7Xjc+DklAPObG7wc0hCtTwGnHNYKOX8saDhksOVrC64jPpp84PnrRaScN4bot5jy6D9LLowntD4i1GQOzpfYZ7uLjpcQuEoGK0XXvxrNRovtd2+Re9/ZEtg5EMtJOKdUDWLQEt62zFBCXu2jyj54X16gobmw== 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)(36840700001)(46966006)(107886003)(1076003)(16526019)(4326008)(8676002)(186003)(36756003)(956004)(26005)(86362001)(8936002)(5660300002)(2616005)(83380400001)(508600001)(6916009)(336012)(44832011)(47076005)(82960400001)(36860700001)(316002)(70206006)(6666004)(40460700003)(2906002)(82310400004)(81166007)(356005)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2022 11:16:32.0719 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb500352-ffbb-4fba-9989-08da162c92ab 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: DB9PR10MB5740 X-TUID: CzdnDUcwfhMU The directories to be cleaned are contained in the code that is prepended to the modified task. If those contain absolute paths, it can break caching. So instead, we pass paths relative to $TMPDIR (code already makes sure the paths are actually below $TMPDIR). Signed-off-by: Adriaan Schmidt --- meta/classes/base.bbclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index a7282110..db355875 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -105,14 +105,16 @@ python do_listtasks() { root_cleandirs() { ROOT_CLEANDIRS_DIRS_PY="${@d.getVar("ROOT_CLEANDIRS_DIRS", True) or ""}" ROOT_CLEANDIRS_DIRS="${ROOT_CLEANDIRS_DIRS-${ROOT_CLEANDIRS_DIRS_PY}}" + TMPDIR_PY="$@d.getVar("TMPDIR", True) or ""}" + TMPDIR="${TMPDIR-${TMPDIR_PY}}" for i in $ROOT_CLEANDIRS_DIRS; do awk '{ print $2 }' /proc/mounts | grep -q "^${i}\(/\|\$\)" && \ die "Could not remove $i, because subdir is mounted" done - if [ -n "$ROOT_CLEANDIRS_DIRS" ]; then - sudo rm -rf --one-file-system $ROOT_CLEANDIRS_DIRS - mkdir -p $ROOT_CLEANDIRS_DIRS - fi + for i in $ROOT_CLEANDIRS_DIRS; do + sudo rm -rf --one-file-system "$TMPDIR$i" + mkdir -p "$TMPDIR$i" + done } python() { @@ -148,8 +150,10 @@ python() { ) ws = re.match(r"^\s*", d.getVar(e, False)).group() + # remove prefix ${TMPDIR}, so we don't have absolute paths in variable e + dirs = [dir[len(tmpdir):] for dir in rcleandirs] d.prependVar( - e, cleandir_code.format(ws=ws, dirlist=" ".join(rcleandirs)) + e, cleandir_code.format(ws=ws, dirlist=" ".join(dirs)) ) } -- 2.30.2