From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7277454056427094016 X-Received: by 2002:a05:600c:b59:b0:3fe:d589:ed78 with SMTP id k25-20020a05600c0b5900b003fed589ed78mr7255144wmr.20.1694414312074; Sun, 10 Sep 2023 23:38:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3108:b0:3fe:e525:caee with SMTP id g8-20020a05600c310800b003fee525caeels1851439wmo.0.-pod-prod-04-eu; Sun, 10 Sep 2023 23:38:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyydzWcIQGSGPOHqtfF821gwupU2q636fpd0BUt5xs2pciKlsQ5jcoLGIuo1zGDgT1RefO X-Received: by 2002:a1c:7415:0:b0:401:b652:b6cf with SMTP id p21-20020a1c7415000000b00401b652b6cfmr7175869wmc.13.1694414310199; Sun, 10 Sep 2023 23:38:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694414310; cv=none; d=google.com; s=arc-20160816; b=XK0XI/t0wEl7IyzqaJhpr3CfxKTIrvh60y37ijFM0bICpWoRHoO2CfbFsq9BlK/3+p ygcFsVSMrUrHRVhrk3OZU03dXkDOSArXJ2iEnwXap6BfTtHUwKispyi0y1A2q5zf0KN8 B29oQ+h3n/hnVfBS9DZFDvpwRWEbgny725uKceMLJoSnwFVBWD+7sB2Xmp+dNZWNcv5Q 0a2GuxeFl+GJBrqYkpoqYDO5YDq3nHH2u+BY1hI5A6DwFCZf30SxORKjpMmGRQ64V46H Hgye7D/ofjb4m0a0rPFMgWDS1ThM+mf7Pm6557ynjsbSHMvh804olpehePMRL7ZYRSco T9/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=eEhODkFVGjZfXLYZUtwswfjoy53il/kOjk3fCKfF8SY=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=DA+G/2oXO+edT1HPxGhbPVFuCNtsFtOF40WC9yqOl2xjt7TMtgEXz0vXvaUfUJsQOL 6uOKFicMQZeWCZhAf3eUjkDkrPoXFiJ3WxlBrotykSQu0cv1ZSvI6iZqYksc+I/OYev+ 55N0aExp4ezJHGVlssQ227k2z2bYEok/FmMTAmaddJrBWKq3yStTFfRsORI8WuXHQ/da mR8z39jb5Cq3q6Bhr8s7Bk9+OQIzE+OSFOaoQljF4gJeaeaBxCnta6d3nBen+9N3VGNK eJK5+BpFUfX4lF/Vj1+zxkfTaQ/lqKM4jjf+r/j0Ky6AmKAbgpkhxfe/twBCQ81F0jE9 5i5A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ay40-20020a05600c1e2800b003fef434e6a5si1012066wmb.0.2023.09.10.23.38.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Sep 2023 23:38:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 38B6cTwa003956 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Sep 2023 08:38:29 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2] isar-bootstrap: Avoid absolute paths in SRC_URI Date: Mon, 11 Sep 2023 08:38:29 +0200 Message-Id: <20230911063829.19870-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: p9QrQVUfMkMt After commit ae3c091c, absolute path to source list file appears in SRC_URI for isar-bootstrap tasks. This leads to broken SSTATE_DIR sharing between different instances of isar on the same machine, since almost all tasks depend on bootstrap one. This patch fixes the issue by leaving relative paths returned by get_aptsources_list() function. Signed-off-by: Uladzimir Bely --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Changes since v1: - Remove redundant "f" assignment since we don't use this var anymore. diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 8af73a9b..3477c2fb 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -152,19 +152,17 @@ def get_aptsources_list(d): from collections import OrderedDict apt_sources_var = d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES" apt_sources_list = list(OrderedDict.fromkeys((d.getVar(apt_sources_var) or "").split())) - ret = [] for p in apt_sources_list: try: - f = bb.parse.resolve_file(p, d) - ret.append(f) + bb.parse.resolve_file(p, d) except FileNotFoundError as e: bb.fatal(os.strerror(errno.ENOENT) + ' "' + p + '"') - return ret + return apt_sources_list def generate_distro_sources(d): apt_sources_list = get_aptsources_list(d) for entry in apt_sources_list: - with open(entry, "r") as in_fd: + with open(bb.parse.resolve_file(entry, d), "r") as in_fd: for line in in_fd: parsed = parse_aptsources_list_line(line) if parsed: -- 2.20.1