From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:ac2:5319:: with SMTP id c25mr2523431lfh.96.1628876988502; Fri, 13 Aug 2021 10:49:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:597:: with SMTP id 145ls407836ljf.7.gmail; Fri, 13 Aug 2021 10:49:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGMJB+INND/ZdjsaHSSDl8bppwUFKPJpILzbbFeaq+cbsrhUOzpOHoAOS/BF14jU+g+kMk X-Received: by 2002:a2e:b17a:: with SMTP id a26mr2657103ljm.342.1628876987339; Fri, 13 Aug 2021 10:49:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628876987; cv=none; d=google.com; s=arc-20160816; b=GlmlOwOnXcs23YjgeI1qslMBoTsDOW2FCgC254+C0ympbWtnf7xiqpAISR8rXfq0Pl u0X8rg96+vzuCMgUY0djdb44zHy4V5VwdjYVRKz/f/HAUG6w0Fq6APj+knF//0TX/Su0 +YUc/f3GTi0BI1zLubYfFUIROdbx41UQi4iBNGCP4qruq6WcXIs/rT1hfoj72Alvj+le ju6l80QpPXS6jol7V28qJx4hmcX2nAzaIFFsSm0KkFS3udY2N6Ik2qqiNMMoJdm7Z64V Nn61GkuCXkTTEwJvbISzH6eFSU/8TbAhCx2Iid9GAk9qdC75p5dcySiKlYjwhWVoLffh 8J2Q== 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; bh=rQUND6sevJ7bWGnDuxJLXeFOoagG4ZpLOWHOLgSEBfI=; b=UUjj9qSTJ3+buglClrIiYvYMHj2EOd1XB2jSSdxZeQIyPtjcW6F7pl2l2Olh4bU4xh WQ/rMpKbOvVNd+hyZrSAP558lvxAyXyMaAnH4CXtclOIWY/0YLjq6IXU4x+3okg38vUd CcJY0DSPo3NHtvCkdC2PQqts036P8Mm1OUDuWuG7yyadlevUv+RK0wUc642vEfiXFB9X MrD2c6dnwutYGLyYMZSbPGh8IwjNS33jShrqmzq07cH3gExsC/vKkTRpTwGej+mTSaBu 3Z3iP6SUgMBAVNfisRYgyaV/Z0TNod2pClZwp6ue4Q4c3yTt3ahlKlkbg9U+xzeF/1wf C9sg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id v2si91385ljh.8.2021.08.13.10.49.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 10:49:47 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 17DHnkrs011558 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 13 Aug 2021 19:49:46 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17DHnk5R002280; Fri, 13 Aug 2021 19:49:46 +0200 From: Henning Schild To: isar-users Cc: Jan Kiszka , Henning Schild Subject: [PATCH] dpkg-base: "unshare" git clones in adjust_git Date: Fri, 13 Aug 2021 19:49:44 +0200 Message-Id: <20210813174944.8833-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210813160434.16eb4198@md1za8fc.ad001.siemens.net> References: <20210813160434.16eb4198@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: j4WShg0cGkpr 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 ?= "" -- 2.31.1