From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7276333978588545024 X-Received: by 2002:a2e:9ed3:0:b0:2bc:f1d3:b54c with SMTP id h19-20020a2e9ed3000000b002bcf1d3b54cmr950621ljk.20.1694153523133; Thu, 07 Sep 2023 23:12:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bcc6:0:b0:2bc:b6ef:c3f4 with SMTP id z6-20020a2ebcc6000000b002bcb6efc3f4ls250983ljp.1.-pod-prod-07-eu; Thu, 07 Sep 2023 23:12:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnj02rreV6SxiiNclwngn/TeuG3Vs2vLjDpfSqCIh1YuS1Y9MDDZrhKSORY63+eV4bh9SG X-Received: by 2002:a2e:964c:0:b0:2bd:2260:46ab with SMTP id z12-20020a2e964c000000b002bd226046abmr858956ljh.50.1694153521009; Thu, 07 Sep 2023 23:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694153520; cv=none; d=google.com; s=arc-20160816; b=dqV2nBSlk0zjtMXAWC9Xrwjwa9tfnOGFS428Rkv6sRbUwX0D66VV3z8oTlxitWHlmA 29IbhL4cAaCWva0StE/ZVLf6jLcOZVTXQKJJ+9Z9OG/+HoN4s43IHMJSKeguovfOIsr/ h45OMEb3HMDBGcoUDrhA5xCT+IO/xw7yzv5UfHRgR2QAkCkzjMDXfCV4iMY92o9YPujo LrU+/EyDy+wGwAel/NvZqkjtapQfV2ZM8w2R1lgy66r6daKLL02QBhLwhVPgUUcX5Yq6 VY+hAGQqjKmrIskj0rO/+U7ipRnKVph56YxCQrCBgZTY8EfVUrYSliPiBPOtrpK8ax7T CENw== 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=7Kz/VsYYxSVRwzzat4Lfjj9MNXEbfDTQN8eUVxio7os=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=PTTtB164uVzILtJLAbM7ccexujEw+74NzIQyAFI9aM+3nSlQO+5YKdHgKVhLCnY8u3 n3cCwrYDmonBJBlyHw8y0wir1+eKNaUglASqZgoM8W5dCyXl+DG0s5C1+1PrP2BD78tC Q9OGZjzc8obMGuTwZv7/V+DwvmMmAbRL/hqYWB5rKM32fbUjKzIrPzxl1aaoihjix9au NMnElPxzDbecL5ylSod9WyvZp18itfai34366e2cP4bh69+GPvcVj/VTxcacpbwXRUkS IUJUGCndymk3C2s/8VmHAap71yDc01M21gtKEs0QwaBSSCSmrGxzpXHsgG1qL2xASYaX K9Uw== 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 w13-20020a05651c102d00b002bcc064ac3asi65149ljm.7.2023.09.07.23.12.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Sep 2023 23:12:00 -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 3886Bx5O023240 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 8 Sep 2023 08:11:59 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] isar-bootstrap: Avoid absolute path in SRC_URI Date: Fri, 8 Sep 2023 08:11:59 +0200 Message-Id: <20230908061159.19001-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: Vez4pa75514N 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 copies 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. Users of kas are not affected since it internally uses fixed paths. Signed-off-by: Uladzimir Bely --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 8af73a9b..be462b91 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) 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