From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6491554293275951104 X-Received: by 10.25.39.9 with SMTP id n9mr124687lfn.18.1513021798454; Mon, 11 Dec 2017 11:49:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.33.148 with SMTP id h20ls1109230lji.3.gmail; Mon, 11 Dec 2017 11:49:58 -0800 (PST) X-Google-Smtp-Source: ACJfBosDSFqKGPXCTobQiM14Ep6vVSfFV/s8qwQRE3VeAv4w7/rksbyTDxbz1QXfv7FeBn0EXdJF X-Received: by 10.25.190.74 with SMTP id o71mr123492lff.15.1513021798128; Mon, 11 Dec 2017 11:49:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513021798; cv=none; d=google.com; s=arc-20160816; b=UIhP6SLuS4Yke6741HTTsRTsb+CIgdJWeRsBG6yOhwWCPyTEr67XRmuDkSq6sEg0s/ rNDhfHB3LeHMCtfA70J0axvtayv9AtxMVjd/Mwm6Fy4atkrGDkzN6+ZlayVvP/Ps+qSu XIsFD6BcJYrQAmk+fqGQzrbqaP6mvOfFMoBnderDw0iV0Ej2eAeCd0aivbAy0x/CTD6V aSSzl/R3d1fd42+i/yA0D42xPA2HCAq+t+EOR1DAIyhnqVsXaQ9BFQcXAQ4Xez3S1Vba D4nZIjINKAA+sXT/vZX9ucyVsAGCiETKjq15FrbPf71sv1ysIakZt1FtlFOImmLsga2a Tfug== 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 :arc-authentication-results; bh=WdKSj/v8UMaca7/kvyXhVszOvpNfFDiHyAVweTdH7Fs=; b=LzARLhpd9GfV2BfGOgloA9mBT7obl1VerHkJfeshpzsVPYavoW4kZ6mWGlXAs+uH3a d2T0WdDQKLjKkaML0ax8RPIU649I9NYlIL/XQ6PF4sj6i5TKrJBG86kV8u2L6iaIGYtt uKLDJgM+finYQeBt1RJU6VLpxD5wEV0ohG+Pqhr0k+bF2VEzyp9ZRBafqyNW7PgQ1rTx VWMLztoET8vZIHGN6dmgmEKHcGXNGgAyg/1/aRHlkKoNY96uiw2zbIkEcaWqzu5capIH 0Gxyq+EyFrLxxGCf1mhZN/7epgFgD0PZqATMRXmquQCGHAKpA89AWBttFw6Jlf7N6D8E +SFQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id g77si1440746lfl.5.2017.12.11.11.49.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2017 11:49:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id vBBJnss4025272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Mon, 11 Dec 2017 20:49:56 +0100 Subject: Re: [PATCH v3 4/4] dpkg-base: Update git alternates To: Jan Kiszka , isar-users@googlegroups.com References: <20171126220025.14168-1-asmirnov@ilbers.de> <20171126220025.14168-5-asmirnov@ilbers.de> <181d9342-4366-cdbb-e86b-99ee62d95dcd@siemens.com> From: Alexander Smirnov Message-ID: <99cb0f29-d710-3d7b-687a-bd8528d81962@ilbers.de> Date: Mon, 11 Dec 2017 22:49:49 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <181d9342-4366-cdbb-e86b-99ee62d95dcd@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 9oZPNwN/Pvon Hi Jan, On 12/11/2017 09:03 PM, Jan Kiszka wrote: > On 2017-11-26 23:00, Alexander Smirnov wrote: >> Update git alternates to work in buildchroot. >> >> Signed-off-by: Alexander Smirnov >> --- >> meta/classes/dpkg-base.bbclass | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass >> index 5d7f8b6..6a78a26 100644 >> --- a/meta/classes/dpkg-base.bbclass >> +++ b/meta/classes/dpkg-base.bbclass >> @@ -18,12 +18,24 @@ dpkg_runbuild() { >> >> # Wrap the function dpkg_runbuild with the bind mount for buildroot >> do_build() { >> + if [ -d ${WORKDIR}/git/.git ]; then >> + OBJ_PATH=$(cat ${WORKDIR}/git/.git/objects/info/alternates) >> + REPO_PATH=$(dirname $OBJ_PATH) >> + REPO_NAME=$(basename $REPO_PATH) >> + echo "/git/$REPO_NAME/objects" > ${WORKDIR}/git/.git/objects/info/alternates >> + fi >> + >> mkdir -p ${BUILDROOT} >> sudo mount --bind ${WORKDIR} ${BUILDROOT} >> _do_build_cleanup() { >> ret=$? >> sudo umount ${BUILDROOT} 2>/dev/null || true >> sudo rmdir ${BUILDROOT} 2>/dev/null || true >> + >> + if [ -d ${WORKDIR}/git/.git ]; then >> + echo $OBJ_PATH > ${WORKDIR}/git/.git/objects/info/alternates >> + fi >> + >> (exit $ret) || sudo umount ${BUILDCHROOT_DIR}/git >> (exit $ret) || bb_exit_handler >> } >> > > You can probably also amend (>>) the existing alternates with the path > that is active in the chroot so that you can also look at the repo > outside of it. > I already tried it before. It works, but git also reports message like: error: alternates XXX is broken. Not critical, but message looks nasty and annoying, also it's stored to build logs. :-( Alex