From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7059736144635756544 X-Received: by 2002:a05:600c:b57:: with SMTP id k23mr2143117wmr.162.1643978609285; Fri, 04 Feb 2022 04:43:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a4d5:: with SMTP id h21ls306357wrb.1.gmail; Fri, 04 Feb 2022 04:43:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxD1qGSmXMIEflbxY2TUQc+waJxaXbxg/drzeTTQXr9E0fo3f3Jzp/qqcCQHbnDMC3HyJI X-Received: by 2002:a5d:6c67:: with SMTP id r7mr2255199wrz.600.1643978608269; Fri, 04 Feb 2022 04:43:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1643978608; cv=pass; d=google.com; s=arc-20160816; b=xb8Up9vdNYBupCHYUobtDRLVDhL8e6BJcAQo3lIagL+bMTJUrlx1SClAXH+cB+hHFI brvNjj9pB5FJwDOYvNkozdCkimmsa4FNsRqpIoYtEBGnzgKJgRRwWAeglO5g59J1sLlD 2vupp+bd6yxue8gveJxxHQCtx45qUCEwOGe5eOp7WM9ZiNER7KkQqC28M6dw7jXbGhIi zQElrLznL7eh3bHsSUKrJsBrGpZPrPEqxH4hlbImk7JFSmi6hZxPjqwuyHs+u2afNLVz pl+YvVj73kw6I3+13MA92qoF1A8WLTPd1vjNg7UIqA3hyq0qh94sCUPBwy0tlrNzz2EK YNJw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=e3ya6yrocAxQyt6P/WOvIuIXqG5XOhgjNHv3uT5h46o=; b=ECkDswq7bkRDF+xIYs2MFGhVZMQwvpLNCTLUe91zelAwf5JhkijlXyaOnpz5aMF5N4 DGmddRLG4xEQNQDC7Z1p7djl7Qt2W9Hbe0RdpXqQWAgw1vJsivQBFI8VjEgxAp0wfCzB E0QkW1ELpbZspNQpEUCKBXtZJ/gXU/znvCgcbudU+ZzFXhJwTIcrdYBjwaXSTnfr2/yj 9YJdzkU09x6j9t+mMx7jnqGYMTFoEXiR/H6bGgnwpZ5sLL+Nm4WJld8Ds4d8aWHIDUtL oVy9woPukY/lCoo/6Dj2B+L2BqxQEXjRTOe7H3LArjOC/XeIELdmwghNLx1chLCNxp51 +2sw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZiVlXMtH; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0d::613 as permitted sender) smtp.mailfrom=jan.kiszka@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-he1eur04on0613.outbound.protection.outlook.com. [2a01:111:f400:fe0d::613]) by gmr-mx.google.com with ESMTPS id be15si355126wmb.0.2022.02.04.04.43.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 04:43:28 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0d::613 as permitted sender) client-ip=2a01:111:f400:fe0d::613; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZiVlXMtH; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0d::613 as permitted sender) smtp.mailfrom=jan.kiszka@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=mwXrVBZ/OVKRD4P16XKWhWHhxibBHqJouepGmSQzLxYMbxIH3aw+wtw6N2Ihswt/IfD3jQ22ZcIeNYGcOdYWXZsr79tzBx553uhqtByYVsz0URJyGRVF5XIrGgShuYeeU5IQmwMrBfCDFrV1OrwVNh6PVTsJeVV7ZdvhNX7jCWQ8SbG5i+3Sn1rwfRLuRz9T+uBYPSeXHg2/rPySKcdrAIX/U1zLHElSZd38e1/+n6q8oUO6BbxGAFUIxTRn6yBmU0h6FSTp5kWtD4aI6riROukJ9p+L7h5O7E3AU019MRgSWZzqklCnC4WHRQAmN7IPuQufO7F3Pj9yzssEveefxg== 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=e3ya6yrocAxQyt6P/WOvIuIXqG5XOhgjNHv3uT5h46o=; b=ebM6qnFmoOseQaxBP46OsL5RFMZqF03hgUKgJrYyesFask9T3Ur/FsnJvbc7o9gZvcsXAmtkhDzi2NkXBAXh5pVlj/HEpwibMK15+YnaUmFl4bqvgWhl2rCLX7KX2xa92oO5AS43XoqvVJjR2HA1+VN7cKYsWb3gIUqVWnFqGqn/rjDPdN9VZ/Vu85E5pdBgO1H52QN6hYFCNi3V6/bHs1meDwJD+Gl5bcfI1niIPrhjemT1rUV61OHySiPiQiCw4zExAt5IfqV8Zv4v23d3yUx/plinrvau/fHZRWAZGek9dcQowScXMEU6l/rG3BftC0z62fAvedJFPuxJYRd1bg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=mentor.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=e3ya6yrocAxQyt6P/WOvIuIXqG5XOhgjNHv3uT5h46o=; b=ZiVlXMtHLODDiW5P2rN9saIXtXEZBSn7a0kl+vBCD1ijte/kuZJN+2565rV2o1Ws7rJhtd8Vj1YdmP/GkE/UC+GujGeQNvuWoOgIZmuPmXc5pvoghx4CcudJeXwBAgkctr5TxXgPbur5TzVwtzCjS6jykssaQEgWze4bC6p+MBHyWsED3XJp0O7a7VMptNvbD7Dq57cszs0vqUKCZS4NSL56HTKUM2vEOA9VeIsVxPRUCttjccwnEy1U3mBQIcPMC2fKeMdPqr+MHbRMbyK5tZJAGLXMJx8goYwe0XevFGyU+TZqcfjbXAwV3efskvR1mkB2wEpsb9ujIf7bzVNrqA== Received: from DB7PR02CA0026.eurprd02.prod.outlook.com (2603:10a6:10:52::39) by AS8PR10MB4487.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:2ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Fri, 4 Feb 2022 12:43:26 +0000 Received: from DB5EUR01FT062.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:52:cafe::82) by DB7PR02CA0026.outlook.office365.com (2603:10a6:10:52::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Fri, 4 Feb 2022 12:43:26 +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 DB5EUR01FT062.mail.protection.outlook.com (10.152.5.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Fri, 4 Feb 2022 12:43:26 +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.18; Fri, 4 Feb 2022 13:43:25 +0100 Received: from [167.87.72.47] (167.87.72.47) 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.18; Fri, 4 Feb 2022 13:43:25 +0100 Message-ID: <1d9c4338-cd77-8b90-6501-1599945e8a5b@siemens.com> Date: Fri, 4 Feb 2022 13:43:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH v3] dpkg-base: resolve DL_DIR in do_adjust_git Content-Language: en-US To: Henning Schild , Cedric Hombourger CC: , Cedric Hombourger References: <0a7f590d-63f5-5505-a9c9-718f9d8c81fb@siemens.com> <20220204105418.30167-1-Cedric_Hombourger@mentor.com> <20220204133036.432f744c@md1za8fc.ad001.siemens.net> From: Jan Kiszka In-Reply-To: <20220204133036.432f744c@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [167.87.72.47] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dbae2f0f-208c-41db-f2e9-08d9e7dbf075 X-MS-TrafficTypeDiagnostic: AS8PR10MB4487:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:989; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 34rukPn6sMcKtWpwqPmDNIxvRtTqcE4nO2ycmDIcOWVJSV+pieEA4CApLALe/Mj8pIlc0Hg70zO1CxMjgfa74cfCqHR46Yx+V0q/4F3fb03tmsT7dFdEIJVICd4Djx+E5vF7vtePR4tZbT2urwvJxmuB39g7zxd+FHo05Lm4blxUcPg7xya0X69CZNnwQCruGwXFaAoMbOoMO4ejc3hJ7l6RfQeuwQORVeLZSkCGeJSzQaDNpwUQ+cdAhfVxSfofC6vhD+nLKi8pCjbj2p6Iaorz15yEvHUQCDJ5HPKUU1l4v1RfrrhY0jzZePs1WkE3+R6NV1zKYwz63c5l8cdYWkXzufcDyXi0idAXLIb0em9CDxa8HsYMGWl3HXr7wTLck3U176UYVRHdjwJCe4qUi0vvOe14M4vNmuHpTV4dYcy4eFZqiIE5YNlcsn92IdszT03TRluek3yJVNnS0DabmI2ueybO6uTP5Yv039BRxgelHTYFUTLlaDoOvisfz2PZ/10I0Iuk6QoA6X+Jp/DGrF796LZGeMzeoZb8ICwxxPqIVfHvI2WpBuzuuU6i2SWhV5ae2ORynGLy/Q0BzTM0slEKsnYvTG8l8otk4YVCGijpDHK5urGY1zTWv40pbSDTvJSp43KOEX4JPQSiZZGPkrrFxeA77cbWhfaQBG4KDznMxUkukDuvD1mgGcVtenGbBqxc7T5OJ2j/6SM0r65tZD8lKWuzgrPLK5ca7PmmIuxbL37JtTZacMJj15BniTuFR3beOD7IOjkfX9wuJGLiuS+D5qNraYHVy04FmVZMmjAJKk+VU9BmHqGZu2L8jVK4pCIMmhKp/HCjjAB+FgpVmA== 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)(36840700001)(46966006)(40470700004)(356005)(70586007)(316002)(6706004)(956004)(36860700001)(8676002)(5660300002)(40460700003)(47076005)(70206006)(4326008)(82960400001)(83380400001)(110136005)(31686004)(16576012)(7596003)(54906003)(44832011)(16526019)(82310400004)(26005)(86362001)(336012)(508600001)(2616005)(966005)(31696002)(36756003)(7636003)(53546011)(8936002)(186003)(2906002)(107886003)(3940600001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 12:43:26.7032 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dbae2f0f-208c-41db-f2e9-08d9e7dbf075 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: DB5EUR01FT062.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB4487 X-TUID: WgipM9dsvTBo On 04.02.22 13:30, Henning Schild wrote: > Working with sstate i found a very similiar thing but in a very > different place. > > https://github.com/henning-schild-work/isar/commit/d7eff82427fbe8e4f5ef50268804257fc9c143a0 That is a re-execution issue of a task, not a race. > > Makes me wonder who is responsible for creating the link, or if every > stakeholder is just hammering around. The first one coming along - one reason why it's under a lock. Jan > > In fact i still vote for dropping adjust git and using "no shared" > cloning. > > Henning > > Am Fri, 4 Feb 2022 11:54:18 +0100 > schrieb Cedric Hombourger : > >> From: Cedric Hombourger >> >> git_link is resolved using os.path.realpath() but git_dl is not. >> If DL_DIR points to a symbolic link, the comparison will always >> fail and do_adjust_git() will attempt to re-create the symbolic >> link. Resolve DL_DIR for a comparison between resolved paths. >> In the event where paths do differ, the symbolic link needs to >> be deleted first. >> >> Signed-off-by: Cedric Hombourger >> --- >> meta/classes/dpkg-base.bbclass | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/meta/classes/dpkg-base.bbclass >> b/meta/classes/dpkg-base.bbclass index 2add0b2..258e040 100644 >> --- a/meta/classes/dpkg-base.bbclass >> +++ b/meta/classes/dpkg-base.bbclass >> @@ -20,9 +20,13 @@ python do_adjust_git() { >> rootdir = d.getVar('WORKDIR', True) >> >> git_link = os.path.join(d.getVar('GIT_DL_LINK_DIR'), >> '.git-downloads') >> - git_dl = os.path.join(d.getVar("DL_DIR"), "git") >> + dl_dir = os.path.realpath(d.getVar("DL_DIR")) >> + git_dl = os.path.join(dl_dir, "git") >> >> - if not os.path.exists(git_link) or os.path.realpath(git_link) != >> git_dl: >> + if os.path.exists(git_link) and os.path.realpath(git_link) != >> git_dl: >> + os.unlink(git_link) >> + >> + if not os.path.exists(git_link): >> os.symlink(git_dl, git_link) >> >> for src_uri in (d.getVar("SRC_URI", True) or "").split(): >> @@ -34,7 +38,7 @@ python do_adjust_git() { >> >> if os.path.islink(ud.localpath): >> realpath = os.path.realpath(ud.localpath) >> - filter_out = os.path.join(d.getVar("DL_DIR"), "git") >> + "/" >> + filter_out = git_dl + "/" >> if realpath.startswith(filter_out): >> # make the link relative >> link = realpath.replace(filter_out, '', 1) > -- Siemens AG, Technology Competence Center Embedded Linux