From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:a05:651c:1608:: with SMTP id f8mr9652659ljq.260.1629053737954; Sun, 15 Aug 2021 11:55:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a592:: with SMTP id m18ls992215ljp.11.gmail; Sun, 15 Aug 2021 11:55:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx66lfde1HN2vVt+9ZKUhlVtKRWqHuRqjhmiXNTwjnMwYUHd00G9nU537ZJQ6S7ZXIUr9i1 X-Received: by 2002:a2e:95c1:: with SMTP id y1mr9834212ljh.71.1629053736676; Sun, 15 Aug 2021 11:55:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629053736; cv=none; d=google.com; s=arc-20160816; b=mTD2cDiPQtlMYsKdASeN2V4uKbj2e03hP0beU4XwAosuWfwGzvUpeF+M2YOxNc9EFq ako5mLD+3qeglt9/DtCipQ1uu6I0H4m2ZPX8iDeQgdxvczSZvPKemBrbei8cIvj/Za7O utDuKodPfzny1v3TKe3gL5GnHveEj/QDgq70c6wPVV8AqcWue/4sognVJyLxtSLo7poS t+80nizgs1Wou876QAJhU6eUlzAcGxTi5BO7w18veUvPvJqeFHA+avhyhDPJtPRNQsZ6 WqWfkAG4A1FiY6I6n/D7LS9hl2KUqMpdk+Oy77ANnTDM5VeurqUjgAAeiZL7fbU5HAIz O/ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=PQwyvZSHPOFhlHmlWhYtfRR2HNJnf4YQVPTqXG+4oRI=; b=0sF+Ry2jtB00cMYL7Mnp4+7lenQAjCCaOFFnR3/2fxuXLDmy8Ur8obweT8MZppRK2b +NfsdjzOcFlSS2U8AvYD9fO7zYi8V3zf7pzr8KZNoKtwtWrVuuePXISoFVNcTSXDIMEK hIP8AH6C1PYLTiD/KNRNONsQ9lTdCw9GERL/qYHurmdu0u7+0sc2SgB7+NSXFYXId11H vgen7gwfG3KHqPMchDYXkszlk52SjP4r5DtqEZZpoz4qVMsmhRjVVB8FugVVsR499s+c y1tDJMGTop86ds9HwvkpzCX2y9b9EomkHwLh5sB2BnGKHGAWfMqP0yNtkzdXrf16g+IP c0Mg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id t9si48919lfk.1.2021.08.15.11.55.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Aug 2021 11:55:36 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 17FItZrm031294 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 15 Aug 2021 20:55:35 +0200 Received: from [167.87.0.29] ([167.87.0.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17FItZMN007153; Sun, 15 Aug 2021 20:55:35 +0200 Subject: Re: [PATCH] dpkg-base: "unshare" git clones in adjust_git To: Henning Schild , isar-users References: <20210813160434.16eb4198@md1za8fc.ad001.siemens.net> <20210813174944.8833-1-henning.schild@siemens.com> From: Jan Kiszka Message-ID: Date: Sun, 15 Aug 2021 20:55:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210813174944.8833-1-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: bcVdwpXz+/wU On 13.08.21 19:49, Henning Schild wrote: > Instead of messing with the alternate make the clone not "shared" > anymore. Doing that will allow us to use git as a patchtool, also in > incremental rebuilds where do_patch might run again after do_adjust_git > > It will also make sure git repos will be usable in all three > environments. On a container host, inside the container, and inside the > chroot ... as apposed to only the chroot in the end. > > Signed-off-by: Henning Schild > --- > meta/classes/dpkg-base.bbclass | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index ec8fbc14d5e4..2a8e3ef4b817 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -45,11 +45,11 @@ python do_adjust_git() { > alternates = os.path.join(destdir, ".git/objects/info/alternates") > > if os.path.exists(alternates): > - cmd = ["sed", "-i", alternates, "-e", > - "s|{}|/downloads|".format(d.getVar("DL_DIR"))] > + cmd = ["git", "-C", destdir, "repack", "-a" ] > bb.note(' '.join(cmd)) > if subprocess.call(cmd) != 0: > - bb.fatal("git alternates adjustment failed") > + bb.fatal("git repack failed") > + os.remove(alternates) > except bb.fetch2.BBFetchException as e: > bb.fatal(str(e)) > } > @@ -57,7 +57,6 @@ python do_adjust_git() { > addtask adjust_git before do_dpkg_build > > inherit patch > -addtask patch before do_adjust_git > > SRC_APT ?= "" > > NACK, we have a pattern now that avoids this. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux