From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6694185847021895680 X-Received: by 2002:a17:906:ccd8:: with SMTP id ot24mr12378979ejb.263.1558623621554; Thu, 23 May 2019 08:00:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:a58c:: with SMTP id a12ls1724191edc.10.gmail; Thu, 23 May 2019 08:00:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjpSz1R6StjdM88ULrZ+Us4V1PBNwWI8nqh+yZIcsPTGmB3HJgw0PexJPMlFeAsApR72q7 X-Received: by 2002:a50:e707:: with SMTP id a7mr92075911edn.68.1558623620146; Thu, 23 May 2019 08:00:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558623620; cv=none; d=google.com; s=arc-20160816; b=wC7tCQgRMIWpYd1N0El0vobJbiBr3W7KWTpW8VLv7JYfUskkZrtBcwOXdsAYYI+Soa KJzFT4l4N/mUxISBjSFimNKfYAgdQJ3oob289Q16XXQZHMOsXZkO1azlW5HqteEhefOM vYWbn8APHfdPEox97/wWyCCQr8iPB3f64aCFhGO8RxQ86uYmhs/rBAvkSsDa/JU4kKj0 kL6izmlXG7cwkW9vLVykfqaW3OwA8u8xcHdTNhMf8yMQRe1pU2P2tOlViZUiWbEFclqs y4cEKSviBSV1PURMn3+/aN04l+Wwtz4bmem+lfOiZLdL6TDzAkhiRcKRMGfK8zM773u1 q+UA== 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=24knkAOg6KlBW1aYaNUsbUfE9vR/cHbgzeKDZ48iPZw=; b=JhWWSZJyX8I8EzjPR6wsepZDcsL1iEBHzn81iX8Nf/RGKYjhX65eltrR156epykxtB aY0Yss4AkvFU9BkrnqEwo832quLor73fpRESyBGh4GrR9rbTARCr7Et7kEvcs9Vrwzpu eZ26U9HzUR+eN9J2HjbL0Yz0bqYU+BivXkBvO8lXn7jsrsrsuIW3V21LJbvN7Q1c61Eh q29Zka4BHskbIL0fNxHwKjGFHpezLV/8c5HGhQLWI0Fs+QhRDQ2sDVidyr5y+xUHpG9K 0F9YesbXt5RtofcQVbEN72OUVcEFgE70AsIChMVI1t3nz6WFRJlPIWcygofQGz/ZTEoY Qw2Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@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 t36si2384131edb.0.2019.05.23.08.00.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 08:00:19 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x4NF0IoC010577 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 May 2019 17:00:18 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x4NF0IaB026127; Thu, 23 May 2019 17:00:18 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 4/7] isar-bootstrap: fix DISTRO_APT_PREMIRRORS regex in case of cached build Date: Thu, 23 May 2019 17:00:12 +0200 Message-Id: <20190523150015.23341-5-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523150015.23341-1-claudius.heine.ext@siemens.com> References: <20190523150015.23341-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: wQqxLtTBJLrp From: Claudius Heine The regex before did not replace the distribution name in the url. The new one will replace the whole url with the REPO_BASE_DIR + BASE_DISTRO path. Signed-off-by: Claudius Heine --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index f8741c2..18e5e8f 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -30,7 +30,7 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg2" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates" HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" -DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org file:///${REPO_BASE_DIR} \n" if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }" +DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org/\S* file:///${REPO_BASE_DIR}/${BASE_DISTRO} \n" if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }" inherit base-apt-helper -- 2.20.1