From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:a05:6512:3da6:: with SMTP id k38mr2299979lfv.474.1628768935508; Thu, 12 Aug 2021 04:48:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5395:: with SMTP id g21ls298180lfh.1.gmail; Thu, 12 Aug 2021 04:48:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvCHe8/Wff/JMXjSfurfhe/Nhmbc1iHAuzJIOC5StLvwv2f+xB1cHrzXI7IbTekBc5XENl X-Received: by 2002:ac2:508a:: with SMTP id f10mr2336164lfm.633.1628768934348; Thu, 12 Aug 2021 04:48:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628768934; cv=none; d=google.com; s=arc-20160816; b=ColzV/kc2urmuenLUfz/lCkAa4u7iba2Hpg3vBiE/M2GSuPdiNBJP9Okd6S4HUlq4Z rf+mqFjkxvUsnIyD1IpNPtOnah031Ak35EyJ3QimkmtV9eCbHwVL6yGd2xwcr/e8Azp7 QS3yE4dqERWm8/laltjKO+eFzK3LsPAc6CQNv1hSbzEHdS6b6p/b4+W5dS9bKUbjGqUG pAChVDBuhe2UekqjS2hwaH3mU74d2vGjFrS6GArYhoFi3m730n7yu12bMK9vTDjGshhl nb2XtDy+4IbhXmJolh76uXsE8WiwjPn15JSFodvFBJQYAvfWe/kwl4rwxpZcbezcgZVK UDkQ== 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:date:subject:cc:to:from; bh=FP+Joc6fsghtoKPFWqiBuP5WHkdR+s+PAIxVciEroEo=; b=XT0b9a+rX0JFAjMobjD2kCh1nnWAq2C983ulI4wtvgs4BmNREx7crJMUWh3VM9+cC9 9E8uUJ2msNhFXHbssNWCtJR6zIx0P5lNRWF8Zs2mZfomyfv6JhMMZqGGEfWn8cnIVb/E M+Uo0ZEWfqkIYkrFOr9F3Oyls0UZIySpMLMd8cC0xZgINbhhRztt7bO3yX+YqFBURN9z 4031W4ecfUIm9tAGU8GCVarIpWjVdA1eJfZE8iB21yC+NKSb4QZZ17qf6RNdg6ff6vBm mfEcSC7j/137ZfP1ci1rTsUazyDsC9BamoTgkCbB85oRp8Ryggb39kks3NtMz+htrHPL l3Cg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id g7si102446ljm.5.2021.08.12.04.48.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Aug 2021 04:48:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 17CBmrWO012610 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Aug 2021 13:48:53 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17CBmqxK030904; Thu, 12 Aug 2021 13:48:53 +0200 From: Jan Kiszka To: isar-users Cc: Uladzimir Bely , Henning Schild Subject: [PATCH v2 2/4] dpkg-base: Make mirror link relative Date: Thu, 12 Aug 2021 13:48:50 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: BehxLQWPWdrl From: Jan Kiszka This will allow to use it both from the outer builder context and inside the buildchroot. No idea why bitbake doesn't to that in the first place. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index fe16846..a4c8663 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -28,8 +28,10 @@ python do_adjust_git() { if os.path.islink(ud.localpath): realpath = os.path.realpath(ud.localpath) - if realpath.startswith(d.getVar("DL_DIR")): - link = realpath.replace(d.getVar("DL_DIR"), '/downloads', 1) + filter_out = os.path.join(d.getVar("DL_DIR"), "git") + "/" + if realpath.startswith(filter_out): + # make the link relative + link = realpath.replace(filter_out, '', 1) os.unlink(ud.localpath) os.symlink(link, ud.localpath) -- 2.31.1