From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:ac2:4e62:: with SMTP id y2mr2115343lfs.9.1629969782266; Thu, 26 Aug 2021 02:23:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:503:: with SMTP id o3ls973013ljp.0.gmail; Thu, 26 Aug 2021 02:23:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLMJqPbjsgdy8+3+kt9aDOUIYYp6PwgN8nx0xxHtjatn43KpLdWPK2/68216Yf5Bp/0zsR X-Received: by 2002:a2e:22c6:: with SMTP id i189mr2213039lji.144.1629969781114; Thu, 26 Aug 2021 02:23:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629969781; cv=none; d=google.com; s=arc-20160816; b=WcpVsvfoyol8xAyDYgHRzdEOQrrtjJrl28nV7afZOIwywv7XhT7SLSpceQiS6BqlAa jUlsfuKxwCSRgCa8xs+Gqr3OfAHLLIYZ+qWvOWzVTnf1qnzba97+4RazuzL5PI1MBM0R iOR98XBEsh2rdnpS9+1N43Jn8WIxFxNtbYXlj/HmLJ7OH19jzyAOmCzD19tTu5tjOFh1 q0ZdNI4R0wXfitRbyGgq2dDv1VE+YT0sL8//KHRc206KcNy9jBX8JF2KvpFCWf0YP/wO rdBsS2al34ZJYr2b3266drCopY4o/1TFFh6dNl7xpxMHZH+THgeImYhLpt4d8JgLd56L GAEg== 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=vv9GJTvsdwsbrhQyWSqzIkGZLF8LKnjs2ujPdcLANVI=; b=M1eeLdD336dKKBa4GclNKk6bg9eC7Yst6fbkliLMTefeGPPcD4CVhItnT7VrdJbpmR ls/npBkFjgP4/n5XOhsYS8V9AMxLccs2I5oyh8Vxd8OiR3jL8Z+QxhaGtTmSy5BJWC0u SUOAwIzB0s+V2IeSt+KjJVuSXPubYV6hLUSAwknl8QwtzAuXjbUHCMh9fg2iRXjOLG3+ OGs01yMps1GVxRVXOKufi324BEQ7CauLYFkEl3xvJoSy7cJh+BSIlaR6ODsYveyoc18Y SLWhB6/b+x6QdD0PWUzBai8Igkyl/KPM6Tdm5I5te8jPLL1JJnPI4QoQC3bJlQSs0itK OU0Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id h2si130416lft.5.2021.08.26.02.23.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Aug 2021 02:23:01 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 17Q9N09M014717 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Aug 2021 11:23:00 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.32.3]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17Q9MxuK029140; Thu, 26 Aug 2021 11:23:00 +0200 From: Jan Kiszka To: isar-users Cc: Uladzimir Bely , Henning Schild Subject: [PATCH v3 2/4] dpkg-base: Make mirror link relative Date: Thu, 26 Aug 2021 11:22:57 +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: iRthEqvhj3uF 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 do 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 2cff1b3..ca1dccf 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