From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7059736144635756544 X-Received: by 2002:a05:600c:4710:b0:3df:ee00:d20f with SMTP id v16-20020a05600c471000b003dfee00d20fmr212475wmo.72.1676552240980; Thu, 16 Feb 2023 04:57:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3084:b0:3e2:1c34:a7c8 with SMTP id g4-20020a05600c308400b003e21c34a7c8ls77445wmn.1.-pod-canary-gmail; Thu, 16 Feb 2023 04:57:19 -0800 (PST) X-Google-Smtp-Source: AK7set/VZQWOrsiURf82Eol84wOL4kasKNoa6la934GQmCU+DoOWWEQP/zoikQ+vQPF9u2rG4Z9o X-Received: by 2002:a05:600c:4b1c:b0:3e2:6ec:61ea with SMTP id i28-20020a05600c4b1c00b003e206ec61eamr3132927wmp.28.1676552239610; Thu, 16 Feb 2023 04:57:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676552239; cv=pass; d=google.com; s=arc-20160816; b=WPyb5edi8/9eco96z2E0eMQxszBtJldEUIjwzj8aZI8+BedEDDjtoiEscMu7a299f3 iJ8tEaFI3Ohvr1y1CKDHmayplSqEO3W0ti0q6l1U/AcHFJwOqL6nXNdo8IRQNl8yp7BX la236/6lu9H4t2m12i2ggUtRauos5V8VrjWYoIDdUuKwdDirykNNwIRnD7viLj5mbjLg KpMYEGhNEbBtzMdPJM0Ez7voDU4U6NXO/l7sKktdGotX/6NWm/TdK21xkYoY87A/m6Mf 8DELz4wkjI0jZ8hLU52S+107LJ1C+6yosXCpXRmSqfH0ByU/WaSt+7tHxmK/M5vNxfcZ Pt6A== 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=6WI7N15sytzSuAWsMg04nC2IQnq5qXXiuqm4H1m3GHc=; b=awW4sa+fQG2zWpyAor7fdSYn0m6sDztL+ztKxdJhA1whUrLrFIlIaWvhCyF9k0i3t4 l20VP80orIF/uC+XC/i3RwLQMNVz653Q4vUVhGUhp2tzoNmFNPM62TAOzKGi76jxPugH 6aLnL9RKqZpObPhpSwRsOeR60/shDA//DFmEIcAHNIGnhF0bNT4USXqRLk/sVCmRbvnU frbbKGdAxjwJkc1DkL0pay5Cnh4MwjiEfgvmBAwP7SgGBFITa7vFbvEp0jaQOSFzm/DQ ZohXKyVS4ZdDj+CUbtiah13jLZnopAg1med39/hQcEfN7K9fQX+NM5a19g7e//ICEnM8 xC5w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MQKJdTGw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe13::602 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 EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on20602.outbound.protection.outlook.com. [2a01:111:f400:fe13::602]) by gmr-mx.google.com with ESMTPS id d5-20020a05600c3ac500b003e1eddc40cfsi298650wms.3.2023.02.16.04.57.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2023 04:57:19 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe13::602 as permitted sender) client-ip=2a01:111:f400:fe13::602; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MQKJdTGw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe13::602 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=nCYIQ/Wc5x/c8UboGxe0burm6P5lvTaF9Rq5u10WzCIOtT9Uy7V/w2AEoV6rWO4DsfFGjUavc2MAp+k2LrXhnBbObhOoDeUhkqUMhrzqI2s5u8lJHC8l8pa2r+h0el6YXoonlSTFCNAMj/WrSmS3+5ITfmWGmBgqgVMgsomN4R/cEEWpGqV0WLW8d/Md+ojIUBEUOZ14r6OY4T2f4hgxR8yEuD+fF8cBkHoArL2hak2K80QM5QS8D5lrVBIImVrrEPmX1pTimUL7xr2+mqTsgZfdhxmVwj25P9kLsqp9jl5Al1GkQwMFhK+v2dyvR7iknECPaQOH4ms0u9PrFwRSLA== 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=6WI7N15sytzSuAWsMg04nC2IQnq5qXXiuqm4H1m3GHc=; b=PRhiQUxh72AHm0M8bwXPPbo/jBhJmMYIYGjFshIaLcnRdGubieMq4gqFRjOw5x70x7AbqDhzJqNHCx9HiVxksGhK324GHi/2K9FMCTpMF81i3TwmFY6itswdtGnqEm+gxTbxgOY0qx8429DeKuseEEFA5/k2hY2MlC+8373WhurPOM2btePAYAUtZbTA0DsylCAHwUPiea/hswMpkjv6reTIzxhoUzrFZw8bUiRdVGg1OW22oSN90hjvRaJP1DSJtsGd6X9GvtYm+qt81FPGiAX5TSLe6jWzhneVkXt+63PYYxgESPfqbXqfH8JrrQg2cmNnnNNJ0J+xcM063N2mMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=6WI7N15sytzSuAWsMg04nC2IQnq5qXXiuqm4H1m3GHc=; b=MQKJdTGwpQooPPFAs/di2BBnaYlidV+A+KovfUSUes/ehKl3Nh4EIgP+ICt+iwTuUL1ZSI4m/GMBLZdh5WO51KnL+2N5xO0tlwIw02iz654gnKZwIirW2YzJrQHFXvfbKvngT6hXdZPGWwkFzVCTHHcRmj7x5APc1bG6eGduvUBE7oMFkg1yuMENt3ItolD+LwJBrhuySqSbTsA4K1Dv++meGocjXnd5ddgbNl7Gf7m46M4DKFq5bUKmRJQZg0q37e+ZnSNsQkm6yJnLSZJdKJAAFVsLHpNkZoJVfImEcp61d4n6XBHip5oTl2jnhuca3s8+ZSpxVr5P9z61+dhsCw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AS8PR10MB7497.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5ac::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Thu, 16 Feb 2023 12:57:18 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::ee44:171b:4c40:d42c]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::ee44:171b:4c40:d42c%5]) with mapi id 15.20.6086.026; Thu, 16 Feb 2023 12:57:18 +0000 Date: Thu, 16 Feb 2023 13:57:09 +0100 From: Henning Schild To: Jan Kiszka Cc: Cedric Hombourger , , Cedric Hombourger Subject: Re: [PATCH v3] dpkg-base: resolve DL_DIR in do_adjust_git Message-ID: <20230216135709.0331aa93@md1za8fc.ad001.siemens.net> In-Reply-To: <20220204133036.432f744c@md1za8fc.ad001.siemens.net> References: <0a7f590d-63f5-5505-a9c9-718f9d8c81fb@siemens.com> <20220204105418.30167-1-Cedric_Hombourger@mentor.com> <20220204133036.432f744c@md1za8fc.ad001.siemens.net> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0406.namprd03.prod.outlook.com (2603:10b6:610:11b::14) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|AS8PR10MB7497:EE_ X-MS-Office365-Filtering-Correlation-Id: d57fa304-fac2-4478-446d-08db101d5569 X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q/wTUL4eMpjMGyelzIWkXw/liRwxpmyeACwUEn+5XCAAShJUrdmZt2XLrnPt+N/4+eJdOWheYyrR/w+HKxhFMecBO33mJZCjRQXm5MO03sCfhcD+OwNXOK5XronXlY+EANZGDTgPtoN8yjGxX5RXR2P6O4itpDfv24Ht6zTSGae0JMWsbsrZpyVmFT7+MNurUmfxLQcNjpK9/IL9Kv7g5hB9apMyog71zm+lgUdwCNO7X0OBgD2m5QUWEFwiPKWoS7Our8nY/hMZYElYHAg3EBJH/JaYM7yPZ3hO+NqwfSUilS0XynB+O4tDBKRX7LFbQ4BxOqB0V9j2LhhHVCVU47oEWWwuO9opGNFcyAxXeS6aqDhQBq61znH577aWflJ5xW8Jq8uekZI/Wo/0ufhwCjyzyi+bXj95Hk6zOOsVPeQQyrrcwGOA0VYZAf0lub+b468n4NRyrh1jJ41Gl+XHVuaMEfP3T6G+niel3Ese3go87QpR0oJEHQH5AGkdTm3e/TGAcrOcxLVNJ9PB1oBJpCnoxdRVNUG5bN1QE/8r1BlhRy7puVlge2omdZWluCcBKL/qzedZoPx4q0XZf8NA7Djem8bJnXj9VEteEGhStffwGWY8pt1xqfptyPO2swpy X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230025)(4636009)(346002)(136003)(39860400002)(396003)(376002)(366004)(451199018)(6636002)(54906003)(83380400001)(107886003)(6486002)(316002)(1076003)(966005)(6666004)(478600001)(5660300002)(9686003)(38100700002)(186003)(6512007)(8936002)(6862004)(2906002)(44832011)(6506007)(66946007)(66556008)(86362001)(66476007)(4326008)(8676002)(41300700001)(82960400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rF1WQRdwvfkvz1w8TXJZ5rrxduGAwT8aiVjOksp8M4kG4f0gIx9cS8VtpJZt?= =?us-ascii?Q?/VLDYeGdCLSR3tjzKdtqHI5C52ZPRXnDg/8zM7QS3wkYi80GEb1zf9nEqmea?= =?us-ascii?Q?HVDDKTGkp/E5Vlko2sXR98JcChhaTLSYqMTd80jMFWKuTCnLdyl/tkLoYf0i?= =?us-ascii?Q?RpU4UUbWXrLHnES7G39J3AfxkyWUFZfsFhz9be3NVmIthn8Np7o6OI2eE0yW?= =?us-ascii?Q?s/b6zwk57RmrGrhS9I7arMm3hTEKkLFVT7e/qxCWphg8xT8Fn2Jvl7fK5Kic?= =?us-ascii?Q?9hyUYoNNUaqlbS+lGgLX93JYfn2Hl/W6EfWw0vtOTy71tTplhp/btLbGDhKh?= =?us-ascii?Q?Qduplob3hFEyMDJB68Jk7/WKA1P9t1TwGXHBGVETL4m7A279q67T71TQaAZX?= =?us-ascii?Q?zKArFW3nlCxO8GleBVqv8Hg06+bkCjSruQO0IIG1HsX+/wiPnXRFfIFg9spg?= =?us-ascii?Q?Qa1ZgfskzPBT1RJjbE/kQpLVjslX5dZfhQNiXuDL4N9BdwSPIcXoNjTxKS8h?= =?us-ascii?Q?OrVC11m1VgQ480Scl0SIMgbZ4zitRXRJPrIwTmxCXgCsaxeivZEmsd211waV?= =?us-ascii?Q?71AridVhCb4BDJoLR9pUhD1fcBKz0pKbkmKTjuxTC4R5c+RLVEvDtbeSVQW+?= =?us-ascii?Q?YF4Zwk0bT3unrRLBTXmkibB4s+c6oRYBg43a7wye3lHRPE1FWovmsSjoiNoP?= =?us-ascii?Q?QQ9qz0IkG1XlwkNS4pcvADOXSAzyp9poNYROj6zXeGvSAQJwW4UNl+R5RV0x?= =?us-ascii?Q?dNyrw62+LdiWEaCTb/2A34sltGjZoZeNkt1RWUik9VOYE5yP+5iF3J35B+H8?= =?us-ascii?Q?C6gFF5uSkyFOVpDj8hs3buM8JMYB06wBJbqbmAGWVjvDqe6FPcUC1jktOESI?= =?us-ascii?Q?G9tkCGFHzSML1xHyH1UD2v7iu7fN4fzY+umKL39oPyNKZ3EOqiC8XWVRD921?= =?us-ascii?Q?d2Z4JTLsyHYkmAUCAq8OKHg8zWIxtXMt18N5zsV6U2u5+2XkIdTYm8O8Xog6?= =?us-ascii?Q?ESjyQSu71jAvDxr7DMBy3eeePqigjHg4F+JpnopF4vbQQWlConwAZ+wH1vhX?= =?us-ascii?Q?pFcLD8ByghwCCGBZgYMbRXZDGciU7gRhaUwsDL7o4fBknXdrGaavIYwvNRT1?= =?us-ascii?Q?coFJRdAP3vmOZ6qwMStTFuMQqrZCiMwdz8VCyZw95tfvgHqAPW5Uow2ifrMg?= =?us-ascii?Q?X+3+RyGCdUB9DmZ83MhdpOvgTje1NOa2WnVsm7Z97+EfE7s06/tjOnHcqyHZ?= =?us-ascii?Q?CiNdDTTmZFpJpyk2Rmj7K5aYb9AFnx5W5Tk8ZEZrtRyempsITnPeEz4kImEt?= =?us-ascii?Q?i1u/BewRQs66GRgFLpr+rZzAorejr+5PM9uNT/A5mzeSSwlAeX5a7oIMm/SB?= =?us-ascii?Q?qdVjEgB7ldH09owTb3J4c/ks+ZxjrDIwcYdTYmHNQPHwkyDIxoMbR9WqGimP?= =?us-ascii?Q?nP8GMcG96+QRo//Eaf45bRfhka5n+IdLVrQbcLW5qWbXX3esIQQ/ucrl9mbF?= =?us-ascii?Q?CohFGOJh5l7gudJPZ3vUOJUGuuvzuOEqiBuck/xUhb67YkQird1WwYeLsp8/?= =?us-ascii?Q?TQba1KORHwlTrxZAC+a3zA0r7cdYzF4kOs8nYaTyXDKfA5jJO7OISq6ZCK+i?= =?us-ascii?Q?Tpk/JSyevteCdnpdj5+b7z5Csv9aQKUXUHlEXEi26zufgzHfYdlMa5J2kXNE?= =?us-ascii?Q?ezUAbA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d57fa304-fac2-4478-446d-08db101d5569 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2023 12:57:17.9395 (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: FJL+U9dfRxgVV7DpqQqt4hUuhbHn3OTQ0Mo8cfkrSyX7jvcwdBNepTs6D+0T4OR92vM54p6bT3ZZk1PWy0c9nWRgM4/Jw67RWUPmmCUj/wA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7497 X-TUID: EA81j3Dw0nXG Am Fri, 4 Feb 2022 13:30:36 +0100 schrieb Henning Schild : > 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. Yesterday i wanted to backport a patch into a component that already gets patched with isar and git as patchtool. And since that patch did not apply i needed to resolve merge conflicts. Leaving git repos in unusable state on the host is just a massive pain every once in a while. I do not want a devshell in a container, which takes me miles away from where i want to be for a simple "git cherry-pick" because an "git am" did not work. I again ask to switch to "not shared" cloning, or to re-adjust when coming back out of the chroots. Anyone on my side? Last time i proposed patches i was overvoted, but maybe the use-case or pain was not clear. Henning > 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) >