From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:a05:6512:3af:: with SMTP id v15mr2058361lfp.330.1628764298212; Thu, 12 Aug 2021 03:31:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a167:: with SMTP id u7ls898456ljl.1.gmail; Thu, 12 Aug 2021 03:31:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxR9UBDG36b1pm9gSHB8BSJOGsdG2agTG6z1Yalq5vFM/dhnbktbFTs0aKVTv+SoxVQ/EK0 X-Received: by 2002:a05:651c:201b:: with SMTP id s27mr2405604ljo.500.1628764296945; Thu, 12 Aug 2021 03:31:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628764296; cv=none; d=google.com; s=arc-20160816; b=0/PvGqh+xckw7RP7xi80MsksbGQOR9KQwL9b/H3OsqBxrU2icgA9EunlSEUqaBT6ea Wo3+KlawjtNADFJNbS91MDYtDhxL1biMnbu5OOmviDpzWzbQoI2PDMCBFu+QRzCVp8PI yKGpBV9vsTZOVHN7Y3EwQxoWtPQEXX6+IG4gTCMHrOK3hB9kCl1D8l2p5kw2hKY6RGZ8 3BxTSLWOwu87Wx94t1h6JEMchpSkPSf8H/YApggApgfe8MVWDA3eirD+fbvjU763NTUs +GIF0Gf9Vi1F1TinVBwP7tClN8q5JxvOo2PvmH3ncFrq/onO5WcFMLy4NZlbRmImlO5s KoJg== 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:references:cc:to:from:subject; bh=DfYd3IABheFodEGyvtUxkusy2K/G52Qw7seEgIwUg3M=; b=wcgtyXdvV+dk6JvdqvA48QzwGyTr0PxjDeO4JJTW8E/i0qrZYNxNPR7G0VBh8BcV1T XKPKyiFg1UKUEyExpVI7Xq9KhoTWrjL9H/+R0snya1kGs+ZUevczUgAHuGHGioVrXu9a 8kgmtN5sxw6JM0/miroVsCIunu0qL6Z2acQyz92ZWH4MQ049dptfaYmIHs6TFKOPGa5W oGHJRPQ63ANZPKfFJGCV9Og2/EkDhZxD6ubSgG7L0LrEFyvkVooLbRQt3kRFEVJ15XKS 3aq6x8pgiqAIme6rWmVdVm3Tm3fqJwRUWdMqaskHAEuncOK7+7c0eFYGgZEsnzFvLimN xWvw== 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 h2si128605lft.5.2021.08.12.03.31.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Aug 2021 03:31:36 -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 17CAVZCj028322 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Aug 2021 12:31:35 +0200 Received: from [167.87.241.87] ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17CAVZ4p012400; Thu, 12 Aug 2021 12:31:35 +0200 Subject: Re: [PATCH 3/3] Rework do_adjust_git to support inside and outside usage From: Jan Kiszka To: isar-users Cc: Uladzimir Bely , Henning Schild References: <52c19135f0fcab888b1c0190876516c25cea71a1.1628760208.git.jan.kiszka@siemens.com> Message-ID: Date: Thu, 12 Aug 2021 12:31:35 +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: <52c19135f0fcab888b1c0190876516c25cea71a1.1628760208.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: fJ60uAyVUlAG On 12.08.21 11:23, Jan Kiszka wrote: > From: Jan Kiszka > > Rewrite the alternates entry to use a relative path outside of the > workdir. That linke can then be created independently of the outer build > environment as well as inside the buildchroot. > > We use ${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/.git-downloads outside > and /home/.git-downloads inside the buildchroot. > > Signed-off-by: Jan Kiszka > --- > meta/classes/dpkg-base.bbclass | 8 +++++++- > meta/conf/bitbake.conf | 1 + > meta/recipes-devtools/buildchroot/buildchroot.inc | 2 ++ > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index a4c8663..cd6c649 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -19,6 +19,12 @@ python do_adjust_git() { > > rootdir = d.getVar('WORKDIR', True) > > + git_link = os.path.join(d.getVar('GIT_DL_LINK_DIR'), '.git-downloads') > + git_dl = os.path.join(d.getVar("DL_DIR"), "git") > + > + if not os.path.exists(git_link) or os.path.realpath(git_link) != git_dl: > + os.symlink(git_dl, git_link) > + > for src_uri in (d.getVar("SRC_URI", True) or "").split(): > try: > fetcher = bb.fetch2.Fetch([src_uri], d) > @@ -48,7 +54,7 @@ python do_adjust_git() { > > if os.path.exists(alternates): > cmd = ["sed", "-i", alternates, "-e", > - "s|{}|/downloads|".format(d.getVar("DL_DIR"))] > + "s|{}|../../../../../.git-downloads|".format(git_dl)] Hmm, this does not yet account for the case that the repo is placed in some subdir under workdir. Will make this more general. I also forgot to fix the task dependencies - devshell is not pulling adjust_git. Jan > bb.note(' '.join(cmd)) > if subprocess.call(cmd) != 0: > bb.fatal("git alternates adjustment failed") > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 9859456..7f5901d 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -48,6 +48,7 @@ GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" > > # isar specific config > WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" > +GIT_DL_LINK_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}" > DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" > DEPLOY_DIR_BUILDCHROOT = "${DEPLOY_DIR}/buildchroot" > DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc > index 0c1fb7f..52a5f1c 100644 > --- a/meta/recipes-devtools/buildchroot/buildchroot.inc > +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc > @@ -67,6 +67,8 @@ buildchroot_install_files() { > sudo install -m 755 ${WORKDIR}/common.sh ${BUILDCHROOT_DIR}/isar/ > sudo install -m 755 ${WORKDIR}/deps.sh ${BUILDCHROOT_DIR}/isar/ > > + sudo ln -s /downloads/git "${BUILDCHROOT_DIR}/home/.git-downloads" > + > # Configure root filesystem > sudo install -m 755 ${WORKDIR}/configscript.sh ${BUILDCHROOT_DIR} > USER_ID=$(id -u) > -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux