From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:ac2:562b:: with SMTP id b11mr1013649lff.586.1628885694200; Fri, 13 Aug 2021 13:14:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a167:: with SMTP id u7ls474048ljl.1.gmail; Fri, 13 Aug 2021 13:14:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdpYKhaWW0TVG/YC4AxJGj07fQo/zOeGZofdCb+LDw3zxTDOgeISWbRTUuUfILfPE9+t9U X-Received: by 2002:a05:651c:1792:: with SMTP id bn18mr3104153ljb.325.1628885693088; Fri, 13 Aug 2021 13:14:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628885693; cv=none; d=google.com; s=arc-20160816; b=Rs5EpfCe/M05Q0rJQElg/C6CwnRvjYIPzxAE9/75O7gWoDQiw+xheUgi8IFA/EdAIh 7dwTCc9xGIjgeskxnihsgkjQXhalapxO/2NfiVTPLpFTrN7Rd2xDPcA4VKRmzSmRsDRW 06GMV8JaoMd+P8fA0x2Es7CvHlNt6dGqfFkwQ0ammJI76ZfMuqUxhUZsiFK640TDsiY4 R9donUHQASAM4PStLV/6gtXJbiRTh8apWN1FfWMysYOQrSA2lZGOJQOFGFBYIHZkBNEe NHqi7bS0qfzml2qEgOkECmKeox3sacAPnFzJ23nLDRJSNI+RUfyo9yNx2sEKxkxvLbVR dKWg== 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:subject:cc:to:from:date; bh=aqJJcQSPfkKu7DseFZiQDbe9UXFtsv2GKYecliG6nRc=; b=hCXPUmG7aAdi9ZJyYpcTZm8e024e+YWnClGu68TNDjd+E5yIE7wBsyxnAmBftKfD5t ey30XvDjQLIPr8mqlhiYkJxbrHXaYP4UEhTGwaRrR0WmuiHUd/o0d6FXNwN7nO3ALg2U nhS0tFpgayx6Ppqm7LJ9O48jQPGXCayA4satediyNlv1uLaHY1FS7Azizryq5tosqsPh MypBedkX4QjEccRwU/6Ob4ZiuhMES5E5aOiX4fGGUoCQa476T9fNnq2+1S+DxzpuP8U0 U3ziSB8jx6W4JfIZg0PTZVVp0tZfEkBYEgnPvoNXHeB84Z8MlXo5TUcZZZBRWsnI19WM tYQg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id b14si120471lfb.13.2021.08.13.13.14.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 13:14:53 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 17DKEq19005334 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 13 Aug 2021 22:14:52 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.32.22]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 17DKEp6Y012470; Fri, 13 Aug 2021 22:14:51 +0200 Date: Fri, 13 Aug 2021 22:14:51 +0200 From: Henning Schild To: isar-users Cc: Jan Kiszka Subject: Re: [PATCH v2] dpkg-base: "unshare" git clones in adjust_git Message-ID: <20210813221451.7241be13@md1za8fc.ad001.siemens.net> In-Reply-To: <20210813201331.24889-1-henning.schild@siemens.com> References: <20210813174944.8833-1-henning.schild@siemens.com> <20210813201331.24889-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: M5UCT7KzRYIr Am Fri, 13 Aug 2021 22:13:31 +0200 schrieb Henning Schild : > 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 | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass index ec8fbc14d5e4..82a4b39f1001 > 100644 --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -45,19 +45,18 @@ 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)) > } > > -addtask adjust_git before do_dpkg_build > +addtask adjust_git after do_unpack before do_dpkg_build This is the change to v1. Henning > inherit patch > -addtask patch before do_adjust_git > > SRC_APT ?= "" >