From patchwork Fri Feb 4 00:54:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 1418 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 04 Feb 2022 11:54:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f186.google.com (mail-oi1-f186.google.com [209.85.167.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 214Ashke032666 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Feb 2022 11:54:44 +0100 Received: by mail-oi1-f186.google.com with SMTP id s127-20020aca5e85000000b002c807e9c48asf3473562oib.10 for ; Fri, 04 Feb 2022 02:54:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1643972078; cv=pass; d=google.com; s=arc-20160816; b=kjPn7vhrZ1+8A6O3t3/w2PsAmbNO0hirKLsRAHzwmr4qkM99eRJ+T2yOVBJPWC1Wph zsEz7vqlDvE6Sx92g45Izm3QdifQQO3HjbQCNJtf9YRRGN7yMYTkbjLnXwDybKpxM2h6 d1dyzB+KlFQFfZiUAYWcrXsVY8Kki1w7a9i6h5BYogcy1B9GvNFeaGNS8beJ6GRfWxKR l4aCkpXZGIuzXl8kOyaErE9lQ0kuirX/PG98w02fSi2MhlpOcB1ZQ6X+kGeACqcRF5Jc zMrU70xr9ZdxrIEFiNDGp8tqDsXRAhFcsSoAcC0wAxXNKGqdcHu3cfgvvxydW+sMUsLi ukzA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=eE6HVn13JmnRvrKwL7Cv+HQYjuRYO0JIcrjcU6eSTvw=; b=tckXNic+1O/gp3g9HqMEAZWqH3x4njVezykQuiaypW2AdMxCRP3EuZ7KTQIfKbIlBA BYBx3snXO05kOS+5+FUHIh1hblBHsvbJK/tagfQ+IVnkGCLVgc3MSQwMTb87d+UpU+Sd vjDBx5e3caT/kQteTsoNJhjZRIFdoqkOpBs95Ppb7r9BzuhOsV5EizfIIstE+A8U7kKl gGYDORxi7u1LCzvwRWwd1qIW32gaqwp8PmFBtAyCg6ez8lrJMYt35ij2SIl35/2W2PQ5 iOO8aT3crJ13BclP694yGz0CCZpaeUGrk8WKnIssS9X2o/3nTPm/ZsykJYbIcivkC0O4 7ovQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=eE6HVn13JmnRvrKwL7Cv+HQYjuRYO0JIcrjcU6eSTvw=; b=FnzD+L44D/gl1N1dlAtBzgd2J6tP3vx9jjdHqONSt1Fz+cT29XxxrCgKA/Ht6aJFcZ SVy7g6UQ/+RT0++h0FQkhHIfGK0ayxBS0a0b0t5EQUe+KnjKNTlV+HE5vQoudVlGH6Kr 4dQ6by7ivI3E1YDHsWr6rBG+PXCZR3o50XTF81d3v8eHSSIi3xf+yKuHLVmR6SGevSSt JmkRANhocScJlm06spcstLYBWDm85rbNWw0esDxRT+rPSSUhqtJttoafnAlXDyMaQw6+ Pu8/F0a6JIhvrLTwekJKaNvX5rzlZqg5sdldzIAij8pNvaIPiEFQbY5ceL3mTVJP1tPZ zNFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=eE6HVn13JmnRvrKwL7Cv+HQYjuRYO0JIcrjcU6eSTvw=; b=z4yXnAWLgnOGvw6/uT2ngJtx9yVpq64fo6PBEKwGIa6bqccAxW2+HzUnYsrmtbJs4R X4z6Zvdy1lpPYYLDHXaWUN6dEEPcEgemXgTB/ltZsvgdVZZiVpJ0Brca5kTXPX694sM3 GO2pt7WkeDqvKQF54oTb8Tqj+bS8+SSX6roEp+tVGuzOAXwUosuATJqhi7rS/SikzjO1 jqMJiCrAtyvDShahKl0MrQ20r5aVhbAlE55Umtk81Vwf67QlC1TeXZ8SnJDNLTq80eg8 oJaLnSjTwkDCPHN5eBqhJFEE920lxwI3yY/D7cDYytMXsyCjvCRu1VUOJSQos/EXLpTp v+bw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5329skFXgWNXUrn5AC78MBITVV4vaSxDC3nY0b37lfAfn2TH+qMS pmAUwHMpqYdVN0cvbLTqHAg= X-Google-Smtp-Source: ABdhPJwC8/ECoOKyfr5tJAexdZyHTspl010g9hkLsIsxyFROcmGuWOzCDl5J78Yzqx3IeKaMEfKkSg== X-Received: by 2002:a05:6870:9187:: with SMTP id b7mr445810oaf.133.1643972078281; Fri, 04 Feb 2022 02:54:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:f60c:: with SMTP id ek12ls220192oab.8.gmail; Fri, 04 Feb 2022 02:54:37 -0800 (PST) X-Received: by 2002:a05:6870:4145:: with SMTP id r5mr425573oad.350.1643972077762; Fri, 04 Feb 2022 02:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643972077; cv=none; d=google.com; s=arc-20160816; b=zg6kwyQTHbqdJbEYPdS/qb6omYfbnZ9ItlR2sX53rIO5VaO/BtGKYtVwsx4YPzbOk6 aPsFUbLcF+DZxT7xHlt/wopJ2XeVn5n5kvKRle3ysOn7/428uqCvOLOgmEAl59iZ3JIz I5rbOSEPEqOi+zvbh4wcfSqI02KMLZyxh9kaCNKxO8xx6u3H49+fc4ojyL32c2D5Vgxu dl2mDKEIogK8DcE9yJimvfOrsMn516tDZEOL3f5KUUK9xd6xvkh9Gp0eOcQtlk7Ck8uL 16vcAY9jhhcJSpU8xu/vh1NFUfwFkEIK0WLU4gHAq2hd6F3saWXVUmkB96KK7pORraa+ hgLg== ARC-Message-Signature: i=1; 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:ironport-sdr:ironport-sdr; bh=QAawDA/NCsK8aUhob9QLv+yJtWPOnx4WxmFY32UwDhY=; b=aBYlmmxpMu5VyAppCX5soJT4Yr4XQoRoGbN3vlajuqydagmgDVkuYifZYHxbHgclOc ED6jg2ZNJfd01hIatpcSj49B4fTJsN1ihEaqgr+JDLAKxIqlgsjre+uSxgYmX+IZayif L7masvY6dqB9APH5+EGr5CkqHOETk2FvcbVipvxA3gZ/4JCYUHjIKwtjk8pZPE8WIq+i /wAepU3E2ngJiZyT49/+gwf+h0B2XDcJhAEmfr5sZYKadE+poKmInVua/BN+4aN1663J OVPVc+JZAH7nNeATA2ivj9lRQ38Z6azADlhdVqzQRt/8QiSGqjn4ou7Mvjg7PDfoLxIB OH/Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id m6si73683oae.3.2022.02.04.02.54.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 02:54:37 -0800 (PST) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: VrUEMr2WRGVu9HygcJD3T3+hfPL9GHAxGOlAndZERY59dY2ZJTUxdVgiOSUEY40wvUHZxLrEy4 wbXGO7Jwm2jC7A0VWPGaCMUNC8f9SVKD1/G0zbu804cFc6Xm8BI8LL/yHOi8wDYvP8FiFFjyXY k3Eukp+mpYfPLqHBqpGCrItZWMphgsB35krHLHjddfHK+jFd21g/N2674hAr25g406XBnff1Lk 9BB5i/bCCDWTlJrY0Uvrbc/Dub2votSGPhSDLCsIKGizzyJ+ePucxLRFqj8wjLYC0slmXlNabU 4ROLVBaZz5SyeYPQjofY2Z/9 X-IronPort-AV: E=Sophos;i="5.88,342,1635235200"; d="scan'208";a="74137808" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 04 Feb 2022 02:54:36 -0800 IronPort-SDR: Md9IzFtAX2CiUKcYl71Y12+jay9elvysTtK3V5VCt1ISIboDQ3DQJFpStORkH2gOUtbEzY3/pr FMsVJBieTUGOiUaVfg0x65N02oQy2HL1UU73GidtY5Gvf9OkOY5gY2MY03wU4xOr3A0g5x98GH 0nuU2g5glUIL3ib9T0kI4p6AgKZHHS10U15ZaG6hzpZ1g5IWTA4B9ABwfsDZgg14bbqUtCxqoi NQOSsytggcldfN8Fk9gt6ya/5W9JwDLQb7e7roXrqmwUwds1tZG43cg+RbOZV5PN6LzIes/lVD 0aU= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH v3] dpkg-base: resolve DL_DIR in do_adjust_git Date: Fri, 4 Feb 2022 11:54:18 +0100 Message-ID: <20220204105418.30167-1-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <0a7f590d-63f5-5505-a9c9-718f9d8c81fb@siemens.com> References: <0a7f590d-63f5-5505-a9c9-718f9d8c81fb@siemens.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-Original-Sender: cedric_hombourger@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX 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)