From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6762100916771356672 X-Received: by 2002:a05:6000:1612:: with SMTP id u18mr17862347wrb.306.1574424308410; Fri, 22 Nov 2019 04:05:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f091:: with SMTP id n17ls4592527wro.4.gmail; Fri, 22 Nov 2019 04:05:07 -0800 (PST) X-Google-Smtp-Source: APXvYqyVVzuggDNYi4eC6qitoLKSJodtZTK611R7bsjmADPJRMDR8n84lao3F9AeSNFykx5t29Ua X-Received: by 2002:adf:f5cb:: with SMTP id k11mr11034938wrp.82.1574424307553; Fri, 22 Nov 2019 04:05:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574424307; cv=none; d=google.com; s=arc-20160816; b=WRUs3NP6qyMK54RwISotY+f3NoUrakVsLWEbFDZ43KGSENUrUkNs2yKQbnP4kGxYza C3utgvNPPhhWnHwaklTk1S7va6HVr4u03DtFmiGAq1xBtsMICSGsfTNaplaJni2SlHiE tSuPaq7epoEVzuA0YdzaWFCCgwSu6umpPESfncDWRmq6G0iwpyMPYqGlFT/3LI2gZ/W+ /9ZE6v2//vdVD6ZlhQg0sKU8uCwlaWQk7URKx2AZrWwpdHdBJkhChxw/S+RQCdoVAwbD 7jZjDaAz7trof1yJElhYFB3kF6a55kpYoXZB1YcC8Ojvu5AMl28Pq/6ffd03JvYOvFb/ HzzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=2Zm7Ys8mbfpVU13E+PRSt6T1R11uwIrVv5ofhcetYtk=; b=ZTRCauSdjvWTSCvG9gheMuwsw5Ka5c5P7uBofeYw5FhXQbbdI7YiYDN1OzDoCVfqdp qXc7WDT066SfZfVEYz/j6sn9I8oLzsYzwOrazKgE2i99hXt+3ymKVfXrItuA+ajjEeQU k61dzywcKW0vbomo/YVFxX4BCYfVfjPfRCZTyq886UPTFTiz673YGZuo178efkzJGKuB Y9MxsPsfDbaRjaAY++pRFmkV4CcZkFVJKpL2WqJ1KA+mQwWXp19wjQKiNetqCrV6usTS XEfM0djsjpHfVfAcH5yDkZmpTKccDSUNOWZB/Zjw5Cee5mwMch39yPBRWVXD9hl1uesJ 5L6Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b66si132046wme.2.2019.11.22.04.05.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Nov 2019 04:05:07 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xAMC57Ne006371 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Nov 2019 13:05:07 +0100 Received: from [139.25.68.37] ([139.25.68.37]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xAMC57hN003248 for ; Fri, 22 Nov 2019 13:05:07 +0100 From: Jan Kiszka Subject: [PATCH] dpkg-base: Expand adjust_git to all git SRC_URIs To: isar-users Message-ID: <424d8510-009d-069e-0b74-3f265c402dd6@siemens.com> Date: Fri, 22 Nov 2019 13:05:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 11aye5a6NK9C From: Jan Kiszka Make sure that not only the first git SRC_URI is adjusted in case a package builds from multiple repos. That's a common case for modern U-Boot (ATF, OP-TEE...). Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 0be1627..af9c984 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -10,11 +10,37 @@ inherit terminal DEPENDS ?= "" -do_adjust_git() { - if [ -f ${S}/.git/objects/info/alternates ]; then - sed -i ${S}/.git/objects/info/alternates \ - -e 's|${DL_DIR}|/downloads|' - fi +python do_adjust_git() { + import subprocess + + rootdir = d.getVar('WORKDIR', True) + + for src_uri in (d.getVar("SRC_URI", True) or "").split(): + try: + fetcher = bb.fetch2.Fetch([src_uri], d) + ud = fetcher.ud[src_uri] + if ud.type != 'git': + continue + + subdir = ud.parm.get("subpath", "") + if subdir != "": + def_destsuffix = "%s/" % os.path.basename(subdir.rstrip('/')) + else: + def_destsuffix = "git/" + + destsuffix = ud.parm.get("destsuffix", def_destsuffix) + destdir = ud.destdir = os.path.join(rootdir, destsuffix) + + 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"))] + bb.note(' '.join(cmd)) + if subprocess.call(cmd) != 0: + bb.fatal("git alternates adjustment failed") + except bb.fetch2.BBFetchException as e: + raise bb.build.FuncFailed(e) } addtask adjust_git after do_unpack before do_patch -- 2.16.4 -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux