From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995453036489342976 X-Received: by 2002:a17:906:5e59:: with SMTP id b25mr2673898eju.492.1628758858194; Thu, 12 Aug 2021 02:00:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:fa0e:: with SMTP id lo14ls2222937ejb.8.gmail; Thu, 12 Aug 2021 02:00:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwj0s14ypTn9CqXqPHUWtMolx07P1uf+F4fDnFgAVWvV89xlJa6tAbhi2vOD7vvNwAmviaX X-Received: by 2002:a17:907:98fb:: with SMTP id ke27mr2646219ejc.303.1628758855801; Thu, 12 Aug 2021 02:00:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628758855; cv=none; d=google.com; s=arc-20160816; b=JWvbLuIyyvoiW55kaMN3BV5QqCRDSEk+d0T8uLY+/n0+lKaVf9n+s2iy1y9peFt+eb 4lWG95lEj8LUdQPoep1VS6tx/0eQ+FCzF4fAUITM1InW3pesWILfik+4JkTAaqqgWF26 v+Jzquh/IhNvvbGI5ld5BDqk/yCj8lfD+t4HKCeuIHQvyMW7M0wJRVilbCT1ACRj6Dhc esfyskLNOj7xSyYdPA7pTvdLV0Ki7sSA8UtwjfbQ+YjfbqRnLHkCSq7b+IYSuOpZLOfY HJD2/STjQ+xeIGVV2ky3Q+Fl7otyQPd2o1/moPtVWPrwa4gZT36eVe9yUPerjnpu7Z71 CpNQ== 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=vME121mGXRwFo9Pv8r63RYkNhHXbHJVs7AEWpWSlmSc=; b=SIIii7zAydHdimrfeXlmx90M0ZBIi9cMYvludXMVZLVfVMclDHNUlqU3oGdG5LR6B8 /zSea/tIV1k7ZzsVtHhJieBrbsCiTwp+3yV+zoTsKcgdRlFAGDiOtGSPWnLinTgF+0SA jVunjkbo+a4IzTg9fpfHzJT2eDn4xduYi6NedPiflg3wEZhmEYWtbLB5CK2WWZUvo5GO 7mJLHQbyldDC0Jz+FYdAYEKG6Rn8sbfSxjPVeFdT4Q0w00roRnYhtHLfD5nojOXMss8W 1x6T+89nwJSfsl78pYMMd3Xg+a6cROIGvv0w3Zw2uObRFtS2Borx8aotNXaNA2sNenw9 YyDg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id s18si164471ejo.1.2021.08.12.02.00.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Aug 2021 02:00:55 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 17C90t2k006924 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Aug 2021 11:00:55 +0200 Received: from [139.22.35.175] ([139.22.35.175]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17C90skB008675; Thu, 12 Aug 2021 11:00:55 +0200 Subject: Re: [RFC 1/2] dpkg-base: Add new git alternates record instead of replace old one To: Uladzimir Bely , isar-users@googlegroups.com References: <20210812081030.4505-1-ubely@ilbers.de> <20210812081030.4505-2-ubely@ilbers.de> From: Jan Kiszka Message-ID: Date: Thu, 12 Aug 2021 11:00:54 +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: <20210812081030.4505-2-ubely@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: tGhneMwEYEyo On 12.08.21 10:10, Uladzimir Bely wrote: > Task adjust_git modifies git alternates by replacing DL_DIR to /downloads. > New path is used inside buildchroot, so that working git repo > becomes broken outside buildchroot. > > This causes problems with rebuilding such packages as cowsay if something > has changed in bitbake environment since previous build: > > ERROR: > mc:qemuarm64-buster:cowsay-git-r0 do_patch: Command Error: 'sh -c 'git > --work-tree=/path/build/tmp/work/debian-buster-arm64/cowsay/git-r0/git > reset --hard HEAD'' exited with 0 > > The solution is to add new path to git alternates so that original path > will work outside buildchroot, and new one will work in buildchroot. > > Signed-off-by: Uladzimir Bely > --- > meta/classes/dpkg-base.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index ec8fbc1..4b9b782 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -46,7 +46,7 @@ python do_adjust_git() { > > if os.path.exists(alternates): > cmd = ["sed", "-i", alternates, "-e", > - "s|{}|/downloads|".format(d.getVar("DL_DIR"))] > + "s|\({}\(.*\)\)|\\1\\n/downloads\\2|".format(d.getVar("DL_DIR"))] > bb.note(' '.join(cmd)) > if subprocess.call(cmd) != 0: > bb.fatal("git alternates adjustment failed") > This doesn'tt work, already tried: git fails if just one record is not working. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux