From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7059736144635756544 X-Received: by 2002:a5d:6486:: with SMTP id o6mr2433674wri.36.1643977841191; Fri, 04 Feb 2022 04:30:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:3c8:: with SMTP id b8ls252219wrg.0.gmail; Fri, 04 Feb 2022 04:30:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrGUSeNY09mJOTXnKNnA5ZkEeM7mf3TzBj5eEs3ZWgM8cxC9esxdx+J4UrTykn5cflnu+K X-Received: by 2002:a05:6000:156b:: with SMTP id 11mr2316230wrz.467.1643977840335; Fri, 04 Feb 2022 04:30:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1643977840; cv=pass; d=google.com; s=arc-20160816; b=zujBpx+Dkz/vNs2mq1vYtOy3/Kjwq0lwF2u9GqMnzkmhjZvoJ6lo6qOrO/XPh8+1At h2PRLRHud5QXsyemqF1g0dGWprD+IvmddtC+jbzEf+HFsGoIG+y0od/ZTLNcPNIzyHPc EdO76DSEPxRW6LQx10bFL4jB5M6aj8+1bz33nbCgsM5WAlI3PrAFmFL2LpwYw/5VBOKc qyptadxOfBzeGr9bxZwffPh0GnIuVVOUSYcdtsPDBk9I94qrb2mKVODkSCafz4sT9TPm rgkWSAIDb4g2ZkEXlbxKqfbiI2S11XzUcHEhjP656PvHANVkhQFmkd6tC88pc7oBKsl5 wP/g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=9+RKBQwyHKNMp1MOM1FhnRZUtFIcvqj52xhSYnpmfcw=; b=RSvJI/5+mpX+Got7NL1EHUZ4cam6mQLN1+Tw0tPp+rLIKuB5y0JTK2JiTT1MvYEcW3 5VrZzY4YntZi48/8pTcjwlXVQdTxiIfEQJNOO42Jvlot7DYyaEl5oOVaaT312xEosvF6 SzcAper4b0lD+e/b9XaeYU9sFsAoL/F9ho8yJUKVbeq3q806xGN+81fOmAYeovThhKMP f0L92cxgrp/a7r0uMhgfkt6kKgCBwPpNHEpVcm6JmWulNgL4BdGRHb5jBfyx05mRKLiq 5Wm2TQP2XDOHAwGErCFRXyzZQ6NkwRTnaO3hrMM/ObrR7e50YHuOZ66wjDCfSmJ87laz Tk+A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=UHKuCkGF; arc=pass (i=1); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.20.45 as permitted sender) smtp.mailfrom=henning.schild@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-db8eur05on2045.outbound.protection.outlook.com. [40.107.20.45]) by gmr-mx.google.com with ESMTPS id p4si66633wmg.1.2022.02.04.04.30.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 04:30:40 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.20.45 as permitted sender) client-ip=40.107.20.45; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=UHKuCkGF; arc=pass (i=1); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.20.45 as permitted sender) smtp.mailfrom=henning.schild@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=TOrQW5AkfIXMgdsejkx8YFXaUef7uoXeiLD4C3OGi/WyceTILHJnrIbZ+GjmpAqT43iYKgERY5Gvq6icB9C4C4LedRUIn3jGJHzTcET2l6OdBYMFidzFZ9/NrTrKrkA0u6laq6CzfATkmIuQHrnQYTRuycUcFJa61imew9aJqxcYyNzd1v0/3hEV0SWPiBrLEMdk3pcTibZO8EISjkgTJuTLY7Iok6PhtAWXoniE338XE06MzuGNcxsyhWif53RibtjPq2pmrIOP6wLErLPqaWuED1rWyCcEgic5zaD575DWW0f8ReV3gW1RdOUqElLrVvrGq0Q5982/MRKl8aHCrQ== 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=9+RKBQwyHKNMp1MOM1FhnRZUtFIcvqj52xhSYnpmfcw=; b=mcRM9n84BJWytC+4w0RWEe28cx4vrSVBJJsmLZ735jO115a5VNDPU3i9NJihjAwpkRIJbuTvGSW//vdIdAVr94Ehbau6u4c+MUVVpu2Fo7OFvtMS0gxD6YUpqz+j3Ep9Wi+vuTm1zbKCuvVZbOsiJuSrmH5MBdTkJywMgC+50u3C+Z7LBWL0EA6midOuX4lvtKZvBZQ49WpcnrqfSsONFOnXFfgQw5opCLT9nDtbIlowOLyaRUMS+yo8HzxjqO2P+NO5x1Ig0NYaOWvf7VghMOavHP5mRBYDzdyLuVHRV5lwtAtxnpplcdvETtUYNWOMO4CkhxZzGfYYlucHwG1D4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=9+RKBQwyHKNMp1MOM1FhnRZUtFIcvqj52xhSYnpmfcw=; b=UHKuCkGF8P6nY1XQRd1wCjwgJHlW5peVggCbZlZLwX7+4Ruqa4mHjFIYaDHYeDDdpJFgzOn/SaMe/R9RXssYlQ4qcNpnKfvpdSYgIAOpojcPR2p3mIGGX/D4WFHz+abHqlGQTEunaoOi7LAbuPQaJRYYHbMWsrWNYVFlHiyob/f19/WPBVXEbaYpMapVUf8v+zf2zey0NCzfwNjHwWzqr8FZmuWbkyE8czEsQu/fLBLOpj/1VaSIXQbUT3lgTr1LehVBKOblgVj5JflAsOOQQDUPzhW9BzhYoYTUKUzTRSprfiyXy+SQfTrK7VdT29lpqqgFdOeZKUMYrUZm1xUqfw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) by AS8PR10MB4867.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:34d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14; Fri, 4 Feb 2022 12:30:39 +0000 Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::95cb:ffb4:beca:fac0]) by AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::95cb:ffb4:beca:fac0%3]) with mapi id 15.20.4951.014; Fri, 4 Feb 2022 12:30:39 +0000 Date: Fri, 4 Feb 2022 13:30:36 +0100 From: Henning Schild To: Cedric Hombourger Cc: , Cedric Hombourger Subject: Re: [PATCH v3] dpkg-base: resolve DL_DIR in do_adjust_git Message-ID: <20220204133036.432f744c@md1za8fc.ad001.siemens.net> In-Reply-To: <20220204105418.30167-1-Cedric_Hombourger@mentor.com> References: <0a7f590d-63f5-5505-a9c9-718f9d8c81fb@siemens.com> <20220204105418.30167-1-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM5PR1001CA0005.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:2::18) To AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a415e87c-1d71-4958-9213-08d9e7da26fa X-MS-TrafficTypeDiagnostic: AS8PR10MB4867:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:655; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RmmeyeqMbOyXHcmyAlMFOVGi74V4rNV6LRbMwDvoealEvhpsQoP2NlK9GV0es74/MmcgBC8A1QvngWQv5d63QxzGgHVZSBynMwnKYZxJIWVr3T/3P5bkDdoQasslD0kxx1YnrQbdJKbfE5kvcC44x1xNYmP2qgrOs3udBoV9iSS08IwOmIoEI3gjkC1fuAKHQgg094X6ZReHQxV0miBk62da2eqE16tmSBQpK6q2HyST8r3ZyQxhVJGWSsbB6hr++7qmN6Tm2gwSbNGHrAuK3rDTBB0MV/xorsXnSkDEdQpRMnW2dX8bPIPY9p28VtQztJdBdkkhOjNsARmG/A4futY2M+kWLDggtWL4UMZSf7+z3f0JQ9CmxkHTra48Je6uLPYN8I/Q8A8zRsuEhNbvqyETDW+zH2tYZtdTMJ11zlNzFsUKRQA+NkEsXIJfrAWp48NR55qgGekptOmqk2ABS/zfTCSJaVfrrWqUqTsUr8pi11odeWMtaNal7HcCiyAL3NhXzsSuniXVQ7YCJ4h/Fvr/VL5q4bKk/nFGp07fxE8dj9emMdAKQGuCn3bFRz5YsE5HDp1wCCkiEZajWVsXC+daruuV+jBuTwp6xteZzkNZ59GjLL10Kz7+oUFv2EiinarEjfQKmKfNEIBfTK9U2ovO2o3RSqrJjdtFwpYNktr9tIK8WAgmEGuLT/w0z4UqN7gXYl1uKN7E/Au/7U5f/rNiyaaCqQLL2TSoG64cRbg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(5660300002)(83380400001)(9686003)(66946007)(2906002)(107886003)(44832011)(6666004)(966005)(6486002)(508600001)(82960400001)(38100700002)(186003)(1076003)(86362001)(6506007)(316002)(54906003)(6512007)(6916009)(4326008)(8936002)(8676002)(66476007)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wW9XxWVSwcQLk2zLAFVFHf/qgHIP+kHgLY2tuoCNovxuxcuoO8sJ+irr5sat?= =?us-ascii?Q?nrQIPoHZIFDDvRUdJga6kEyZGoxA2H4uS3TrX62h3zBkNgIY/e11cSMHF4Xt?= =?us-ascii?Q?bdaTAnwXWihz0SU5u2ssJK50th89MQ6Yr6tp7a5aOY8QIVMnQuhNOz0MNYDX?= =?us-ascii?Q?nhpy8WHlTFVlhKMUWhr92dHbwSICJqB1a4vA5svNHfya886s+Sj43nGCWs28?= =?us-ascii?Q?/SfENdQDHTzqVMPV8Smm1OTBl+J6oilKv+3bIBFfsKjSJtPYFTJVpDXYBsLO?= =?us-ascii?Q?/t7vKHych8ev8HE5TWm7I6wY5d9V0DCZ32tJZg2P4Sm6pMz+wIvMMBEyT9fp?= =?us-ascii?Q?MzfbNE1/1QeldV+IoP9wF0VfpRj10R5epjUlW4HKNS97P41ApgsVzlvC+015?= =?us-ascii?Q?xJ9ewaa+27Zt8BLORgOFuwmDnOxaK/5OufJbdYxU/mq4zGquJegcCFTe/BQY?= =?us-ascii?Q?DgGlOT/VX4qbS2E7fmmqOyThmV8xXPEP1Ocs5oEWblI+RYcLzkMJ+4T+1yQu?= =?us-ascii?Q?tluUf5Z4Sy0n47XOOQEkLsy0JA3VGo2MQNpa2zZa3F5zqhwCRh5HyeMpKISc?= =?us-ascii?Q?hLHbYRSjAPHEtYnnNYix8YHzarcaLuA2fS9h8pFjbIAA+zHEW8f445c0b/hS?= =?us-ascii?Q?EIuNldM90KwHmOunFpjj6h0FVXRavn8ZnuEx9Qn0Un8GlW7/ZBxAYZbf8RPM?= =?us-ascii?Q?sZy+BLS+jMRPu1bCTY8AZKLQSu6LrWWv3TjAHs8hLkdB4HLyYOIx2wZzqw9N?= =?us-ascii?Q?kiZNusXBnnh+K7EPw6JTK6Rr6ZYirH2xnZyc2RUmrfn+qc4D5O1QvF1ROFto?= =?us-ascii?Q?S4mLt6uyqJNJJTXvm4xwLgtNdyN6ZbpO2cdeL3nmiiMD+OH5TT4S3jHAgZiO?= =?us-ascii?Q?rQPf0Z+qxctzyZ64VMNfJrOFqPeExflSlSXEoO1k2cXs2vnyMSJ194ZazN3a?= =?us-ascii?Q?863DryUXvIGJrAoXXKjJqryB/QVVikEsYSgFhpCjDLIeUB1wHYHQux7HXofP?= =?us-ascii?Q?oL2+yHNBPJsJJVCpnt31je73pEJpKIacI7sI5ZJln/K4MG4CQ4Pzp1dJrG9C?= =?us-ascii?Q?iwjZBy1hS27eof4i+ZPT4k95/t4woMDAniaskNXfJ5wSM9zMuJqODWpvXyQB?= =?us-ascii?Q?lSRbHPnAJsMGhrI0T4qbSXWBWUwP5voGV3dF63IQbOQVlU8daSp/pj+pUYd8?= =?us-ascii?Q?6Cwl5dCzKibIYUeWsYYYCzGoz46f09UO1Fex8iXbzGDmhj1LCHh+GLcK6uq5?= =?us-ascii?Q?znX5eL0N5OoDSbfbzLVt8+n6WSiPztnM4FJy5u9AmUi7KUUi1txLQdrtwk1e?= =?us-ascii?Q?4qybH3uJmDIPGMkXYU77lY4Ed/zIXYrHI1IVj6JnXQQK6ikf1eJh03UzdxTD?= =?us-ascii?Q?RXUvdrTFxcTnO0Yz8KTc5ipzJMrtU+7zxfkuKwA/b5oh/9i9OhasPspQROsG?= =?us-ascii?Q?U9eOFvwXbITbTA6gZM+FJD00RhF4u1e8QFrx11+9WfQjnlKFKloZVfBxMbW7?= =?us-ascii?Q?rCMKPvMqi1OGXaEw4ijlcK3VvUZQCsVPbnivBLZV6+pnC9Z5ApPHeBDdSFdf?= =?us-ascii?Q?+ijrT9ON1SqT3FMmIoBdV8GacPEv2OMrU1SzJFXNIZMHjl9xDyYFrcG/rFiL?= =?us-ascii?Q?tG+a7fk3EFbPhzIdZ4BFRBR2MOxmCPuawwX+owf5EW6ppp9PoGD9aWPFGUqV?= =?us-ascii?Q?tj+IF3c70LLZsGMUlQInkI7XiDnCSIPLWezh+nNQhAPDASHZt/nFpwzEzcc/?= =?us-ascii?Q?D/K+rVUXPA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a415e87c-1d71-4958-9213-08d9e7da26fa X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 12:30:39.4196 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Q87DUJTbAtzZzLbqShO9Ufhfz/mgKVy8tDGZZ88qSBJDS07UKRHdME6SBQ9tXXwmBTfLC0/LsSwIs8141PqI8JfMme9/13mHOxBi3JlPxsg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB4867 X-TUID: i+9je310wNbr Working with sstate i found a very similiar thing but in a very different place. https://github.com/henning-schild-work/isar/commit/d7eff82427fbe8e4f5ef50268804257fc9c143a0 Makes me wonder who is responsible for creating the link, or if every stakeholder is just hammering around. 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)