From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7278630384048275456 X-Received: by 2002:aa7:d793:0:b0:523:1f4d:4029 with SMTP id s19-20020aa7d793000000b005231f4d4029mr4125393edq.21.1694688197944; Thu, 14 Sep 2023 03:43:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c719:0:b0:523:6ada:2ead with SMTP id i25-20020aa7c719000000b005236ada2eadls490727edq.1.-pod-prod-03-eu; Thu, 14 Sep 2023 03:43:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAIzDbRLTRrK4SxuEWeHb5dACf/M9IdjfEGlI249H+WmyXRDHXOdWM95nTWb5DCHHZz0i4 X-Received: by 2002:a17:906:76d9:b0:9a9:f14f:7e3b with SMTP id q25-20020a17090676d900b009a9f14f7e3bmr4167880ejn.16.1694688195886; Thu, 14 Sep 2023 03:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694688195; cv=none; d=google.com; s=arc-20160816; b=v8/ld81orJeobgmC1/XhWuCT/TkYNz5bxSNKFYEUcm3Hg7KvQfjYXKbBt8MlDHoVdw uZmg0CufEPfiqHFyH1/OAvcHjQFPYJprpyy5nLeNFwxt1wW1yHatRLyUtpZW5BF+jDMO YLb/cJoHNxyRHIWAPcjxiDOWZH4lAzvFqcsBt22AK3A9mVQe5P5ysl9G5lfFFjXMeO2/ Wm0+DxRU9otB1MRqNkd7z7FuhUxujv44fCClFCHeyS51yIz/yNk0N4Tsn4h5PEEqbywb AJAa5LMIHVIr2nGzTOe5PEVezZUazJfxvSsDvsKsAazAnRNWAvWHwB5K1yebKYp15UVb cr7A== 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:to:from; bh=kF2tLFolOGGoM7wILDB00zluZI83MPsF4r6tPlhYIkU=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=bASPlGZTa0OQgIdifTgTXOCGxFqOQ55bjYbB+myE13hGZCkuMzkAIrX94zFTTM7t66 f9gvzz+1qHAm2TOfIwHwdWD2CEz0Bj2e4F3qSSsgUPig+lj26eQF1HQeD6ZliYmLcURT 688Lvfx0t8bvzilBdl9rkv9wxcJjT14IiAfgUZBeb2y92z/pImKQfAaySeRQvGzC+3Cy ywVImB+2KqczpOYUU8PqTYVAZ6Y/VY4Vup2fsn2I/GazG6NdeJyGcJX50oq7sELKXeg0 58RULK9l29ZZGdctvnS2CEJTvsUyj+1ZS1b6j//115WThCJAOSGQ+Q2Puo5/eIVc9ANq dohA== 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 ho19-20020a1709070e9300b009adbb310e33si60843ejc.0.2023.09.14.03.43.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Sep 2023 03:43:15 -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 38EAhD5h019231 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Sep 2023 12:43:15 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 3/3] isar-bootstrap: Avoid absolute paths in SRC_URI Date: Thu, 14 Sep 2023 12:43:13 +0200 Message-Id: <20230914104313.30231-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230914104313.30231-1-ubely@ilbers.de> References: <20230914104313.30231-1-ubely@ilbers.de> 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: XYrIeDr3lPIg 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(-) 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