From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7082705989547327488 X-Received: by 2002:a05:622a:1cc3:b0:2ee:fc72:f6b2 with SMTP id bc3-20020a05622a1cc300b002eefc72f6b2mr3044302qtb.118.1649765313252; Tue, 12 Apr 2022 05:08:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:620a:462a:b0:69b:f575:6ce4 with SMTP id br42-20020a05620a462a00b0069bf5756ce4ls10552494qkb.10.gmail; Tue, 12 Apr 2022 05:08:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKBwwJva0i0SVPAzZ4lriuh7a1jsQJloVOlL+MQxNqB+a0IlodDtENQzCPVnCvH9sdFDK6 X-Received: by 2002:a37:8d44:0:b0:69a:224a:dc27 with SMTP id p65-20020a378d44000000b0069a224adc27mr2685237qkd.563.1649765312658; Tue, 12 Apr 2022 05:08:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649765312; cv=pass; d=google.com; s=arc-20160816; b=wGk7dOpf9+shybujm6+Y6ZFFDY1L3NryBpJ0Zm0tbCL6G4Lhdvl2yTxy0WHTTRCRpT OxaXc08NOcV6pisaliJoLYRPolG6rF0xQzAZNGi8rejAUsmWTeuTlEEGt5q+CNXTcSNQ +XWUYRY14COUqLdew4O9EWyQiEMk/YnTFHlwM1GG7swsinglw4t4V9oV6mepSPtVFumK AqaEBm5Bsuj2EobkW4YvFaSKaXvllm+e2e6v/ezt2mBA8likJjVc6ZsCgfWqyOOYBtc7 bhF0jJ8bEofX+U5oHGpEx/7P7Lupbtx1Jw2LCVcu7q5SKWYayCA0pZFDLDInuB1+Y0pt LF9g== 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=sOX1IYlmoFrnPCGa+pKha6xY9jarasEzzJwNXiFwM0s=; b=izJLxmTcqyWCCCoku00qZdQtOcbwtjLHnHq03BZ8iDmPsZNXYhs6Z/IunRf7WgiCQQ UfinlybW23w1o9UP8bjS4D78vw2OzVmQ9l1mC7de/pe6C9w8hDM0RHZAwUEri/tieRL5 nu6Dh9pP2WteFnjMirr9IqHIcm+i5Ijnnxxb+HnhWWR2hchQkSga9yo4zTxrIdqg6mA1 60aRj8DnkpA6tIQqvjca1qTK7VgpyDhi8JjBv/bgoyFNLXrRVPTx53QPPGkXYzGa5hUY mPEAWflkpm8nPphU4GIgJrf3vyeJHpDjfzo7N3KLPfGJ+kbJFpN9MbFave+kaeKAWSfa RSJw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=FCWieaLB; 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:7e1a::625 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 EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20625.outbound.protection.outlook.com. [2a01:111:f400:7e1a::625]) by gmr-mx.google.com with ESMTPS id p5-20020ac84085000000b002edb5d721efsi1209903qtl.3.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:7e1a::625 as permitted sender) client-ip=2a01:111:f400:7e1a::625; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=FCWieaLB; 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:7e1a::625 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=koVwZ4LqCRloJ4J62+9fcXTNbJ8KgwYNVjRXFNs59lU/Qr6v3AC8d6X8RqXKjbmqSHMiuPXMvuwVTn3cJte/hKe3QSNEzsx1rf/PVgs3z62uqKPFkVWWo6Ef2A5xrRX9wcpHuNRBmISggH2eQVc3wZ6U33tg3Y2Bq9GTIe6GYDnfIaasJK9xgDukBXBbqry1j5EZRSBlYgB6XB1xsfEU1ilb0vXTvl6RtMHcmpkLVWtofIauvMS0TOoHm9T6JNZlaJ91HSjkhSbO2yL3W8zT0jz8mG9y2Akk7Tqyd/o+CLAvQzlfwnPIrnGmZfPJVlYdae4VMWnsO7U0nySLpjq99A== 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=sOX1IYlmoFrnPCGa+pKha6xY9jarasEzzJwNXiFwM0s=; b=Y58q79NL7xwaplrel0JGlcsh0tlZG2I8DmmWcwoX0S0w9/Nu7HwXhpd8wQzP4XxHeraMZydGQgl8EA8dA9cCDrqWJ3jZAeQ2YjwZlLtwIxhrR2N/FA0eXg+7q2Cab9SDao5o7abTqC/0kFXXUvHcXUHjN+163X1Qg1RJuaxtu5R8kXS3DXSKdCLqQL6vN1CFKEpKyBH+igFL3zLhx4OL61EUm2m4Gh6SCf1ClVNu10nC7PGuT6FsXRK9/Or/C/JreFL/XKEtVy48nXjE1iwaiPj72bxH1Owb5K4/ffTbC+1jkCjQi7u6rsYG4n0CeYKm9qKt4FJDz4iKbKej19ONpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) 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=sOX1IYlmoFrnPCGa+pKha6xY9jarasEzzJwNXiFwM0s=; b=FCWieaLBP2jqG75QCzy/+oX0xIVs0AxbuzJYIAzGybPRWg4nTUqEOKmNLkVKTQw0KCR20+e8xIdAoFoKyJgIsqDCWqZZeYOpN+XXWmqqMtqDUE911v6W+fGHTwP5v04qKmm2V8PbgwnXNdjuGQUz3/04Wr1ufLSXEklOktn/JWAQPy0BMAMDNXtTva5tjAKDg75KUqR7be6Jf/Ej94HIAUu2E2Q2zNgq5qV3PE081Y7Md3MfVJ8/JDE66a1Bs3ooO0t5IPDPmc1B2eFX7lVC70yNdSbr0JOx+mkXhwZDQ2OMZWAmFlf2lmAUq5NLyU4dSHMa5Fpr4snuI9KC8zhjzw== Received: from AS8PR04CA0071.eurprd04.prod.outlook.com (2603:10a6:20b:313::16) by AM6PR10MB2344.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:50::25) 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 VE1EUR01FT091.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:313:cafe::e9) by AS8PR04CA0071.outlook.office365.com (2603:10a6:20b:313::16) 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.73) 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.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by VE1EUR01FT091.mail.protection.outlook.com (10.152.3.27) 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 DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) 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 4/4] base.bbclass: don't pass absolute paths to root_cleandirs Date: Tue, 12 Apr 2022 14:08:13 +0200 Message-ID: <20220412120813.467516-5-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: 36c1cd55-0333-45e8-d625-08da1c7d2805 X-MS-TrafficTypeDiagnostic: AM6PR10MB2344: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: 8cuYUTqkJuDr1FT+mZxXTbtok9le375oMeVqjrfxcNDHMqyED9NM2ue02zKMkJE1OyBKg4si+uKBn1BdsFD+GiXN84+RMcwCELSakq3L3hoMC+cvIjE9HQrT3F1mNSKnlgjgfabizFGmHldJ5NHtfDdqX5BSR0W6KefdXilmRM5rUWDfDbw3mZFAy5rvvUISjn4fWNaaBOh3gUNSK54QZuBcrrxPmF9xxSXxrsKrDZcKbvjIL/NvB8tqLzQQUF10aRs/BEGD+s+b4IgUdxfQrliA1LHHzTTMaK04xhXYXgnJdY6SiqHhL1TS09aFanRuST10CfnYgfTa4Gm6QufZMvc6s3M8FgU2RrcIoP9d47TuZaHaZCRRcWPOe3SROlS3AQrXqDZqqNGCl2IBzy73Mp5b/pxczUcJ0yCdIP9P6YUorpjmxm6Dgtn5k/NeWnLu0hIL9nYV/efTWZfGv38Sn+qjxCnl82zHKpe+dPmRZGJzL54O6uuKgBsxyU7GPTlgQp7oND5QvDd2r9jhDMpCN4z68VGPHDLub2ucR6NH/be0iGU2oHw94n2w3o+D8ikoJDTLtgOp4/lBEE6jTI/tgFd5JTKOLCisXtsha1cd9PsHu6HlnilCkMH0rgZ1XoZWdnZPGxiz+LAlFrId30vbfUyUZCMabSbQsjf0qiRa1LWCnpK3AfnJGvLTYBMgz6lr6ub8RLTyviVxLd/rJ9v93A== X-Forefront-Antispam-Report: CIP:194.138.21.73;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)(8936002)(86362001)(82310400005)(36756003)(40460700003)(5660300002)(44832011)(6916009)(2906002)(186003)(8676002)(70206006)(70586007)(4326008)(498600001)(16526019)(82960400001)(356005)(26005)(81166007)(83380400001)(6666004)(2616005)(107886003)(1076003)(956004)(336012)(47076005)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 12:08:29.3682 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 36c1cd55-0333-45e8-d625-08da1c7d2805 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.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT091.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2344 X-TUID: 49QAiHB4vOOe 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..4ec2c813 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