From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6522335879194738688 X-Received: by 10.80.202.11 with SMTP id d11mr1429883edi.9.1518600629367; Wed, 14 Feb 2018 01:30:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.133.197 with SMTP id q5ls402759edh.1.gmail; Wed, 14 Feb 2018 01:30:28 -0800 (PST) X-Google-Smtp-Source: AH8x226QEJWathIZblJWP2+53b/R43WtRlCk0lHGpfeO6jTI48L19PPYJvHyrCUjTJA8MB8m8rsj X-Received: by 10.80.149.81 with SMTP id v17mr1432035eda.10.1518600628722; Wed, 14 Feb 2018 01:30:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518600628; cv=none; d=google.com; s=arc-20160816; b=vLOyquio2x71Ph7EpyCcXCmgh52urWlrq9KGzFIwXs3Spt5kuoiYgOEQeQfwHv+vj0 1CKoOO5xvZ+3dY9KxVMXvdetod/KwdQZUP2Pqeax9K7C+FMdMX2n92bXqAkPLr2BpMzl /JW/kwv21GzZMSCDGXjt/+SjApQq4DHx5i/lx2G67EjUXbEhFhq2DYG8cJ31XIy4pm5L w0v0fNkE8J3DmmIp3SYpvYJUoxkL+QEqyKVe3sxbwRn7J/ZOWERahv0YQADHlvEwan0x Pd2yRKh6sBA81TyT1JrJWC2KZLxhicpyfp2IxzNK0LuHRc+mla3ndIrv+dqUZ/8brO5W 3LUw== 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:arc-authentication-results; bh=MQEwLxM8xnEzocoUzOtbiHUDF4W+9LjUh8uIG+xVt6s=; b=YFI6j4DEs3vQdkCEcoCFHzUaPmnCY+QM61O3IJAQzR4czmjWfQP34dQGRYiPYKjbUp Ib9kf1AYvR5+zr87tsom0D6vYzDegckJ3J6doWBGAAC/gO8gByo0Fejsn3GECXLcVti3 xHtImNxSQzfqUNUS9u+qIwzpUy+sgdd9U0wNMOYZC8fDJZCc8n3bu3zrQuoAcPgZGWea rTd8yaeJ7Ynn314xzfjCJVnXVcskC73ZrbDOajx0PbfO94s2w+pQDARGAsrqGFHxjCb6 iQLg0aZym/UJgOpBSx9D69dhcN3UrFkg8OwI6NKMwuMEU4Lvr2ACJMnhfTkYmBSRieln EUTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id n22si525270edb.5.2018.02.14.01.30.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 01:30:28 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w1E9USIh028980 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 14 Feb 2018 10:30:28 +0100 Received: from mmd1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w1E9USKl002861; Wed, 14 Feb 2018 10:30:28 +0100 Date: Wed, 14 Feb 2018 10:30:27 +0100 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] Make sure git repos are usable inside buildchroot Message-ID: <20180214103027.2c4a7606@mmd1pvb1c.ad001.siemens.net> In-Reply-To: References: X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: ijyebPPsxZRq There is a similar patch from Alex floating around. My opinion is still, this should be fixed upstream and we can wait. After all nobody forces anyone to use git and most git-servers should offer tarballs, which are probably often faster than git. I would rather mark git as broken in the fetcher, but that might just me a result of me not liking git at all ;). Henning Am Wed, 14 Feb 2018 10:14:18 +0100 schrieb Jan Kiszka : > From: Jan Kiszka > > bitbake clones git repos into the package workdir in shared mode. This > creates an alternates link to the original download folder. However, > that path is invalid inside buildchroot. This disturbs package builds > which try to derive information from the git repo, such as tags or the > delta to the last release. > > Bind-mount the downloads folder and patch the alternates file to > restore the git repo access inside buildchroot. > > Signed-off-by: Jan Kiszka > --- > > Applies on top of "Move buildchroot mounts into dpkg-base class", v3. > > This obsoletes the bitbake patch Henning developed to disable sharing. > > Tested via jailhouse-images (required changes not yet pushed) where > the Jailhouse recipe makes use of this. > > meta/classes/dpkg-base.bbclass | 10 ++++++++++ > meta/recipes-devtools/buildchroot/buildchroot.bb | 1 + > 2 files changed, 11 insertions(+) > > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass index 895ff26..241dc2c 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -1,6 +1,15 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 Siemens AG > > +do_adjust_git() { > + if [ -f ${WORKDIR}/${S}/.git/objects/info/alternates ]; then > + sed -i ${WORKDIR}/${S}/.git/objects/info/alternates \ > + -e 's|${DL_DIR}|/downloads|' > + fi > +} > + > +addtask adjust_git after do_unpack before do_build > + > # Add dependency from buildchroot creation > do_build[depends] = "buildchroot:do_build" > > @@ -30,6 +39,7 @@ do_build() { > sudo flock ${MOUNT_LOCKFILE} -c ' \ > if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then \ > mount --bind ${DEPLOY_DIR_APT}/${DISTRO} > ${BUILDCHROOT_DIR}/isar-apt; \ > + mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads; \ > mount -t devtmpfs -o mode=0755,nosuid devtmpfs > ${BUILDCHROOT_DIR}/dev; \ mount -t proc none ${BUILDCHROOT_DIR}/proc; > \ fi' > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb > b/meta/recipes-devtools/buildchroot/buildchroot.bb index > 62979f5..9b4e7d3 100644 --- > a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ > b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -38,6 +38,7 @@ > do_build() { > sudo rm -rf ${BUILDCHROOT_DIR} > mkdir -p ${BUILDCHROOT_DIR}/isar-apt > + mkdir -p ${BUILDCHROOT_DIR}/downloads > mkdir -p ${BUILDCHROOT_DIR}/dev > mkdir -p ${BUILDCHROOT_DIR}/proc > mkdir -p ${BUILDCHROOT_DIR}/sys