From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6694185847021895680 X-Received: by 2002:adf:fdc1:: with SMTP id i1mr31422822wrs.103.1558611599105; Thu, 23 May 2019 04:39:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:148:: with SMTP id w8ls1660395wmm.3.gmail; Thu, 23 May 2019 04:39:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwlXgqXiV07h6BbTXMvqh+Hwa31q5BQ0180vyHFEwsaiR/ajTaTFR9w7IaNMKNqjbNVbryB X-Received: by 2002:a1c:3c2:: with SMTP id 185mr11673784wmd.91.1558611598699; Thu, 23 May 2019 04:39:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558611598; cv=none; d=google.com; s=arc-20160816; b=gtugJZ7LPxMjksTxFNFPdmVLWLd2vA4EWFiIM5fDIR5c4Ahxr+gjKxm9MVPx8tp5s3 kc0T1ZldvvC1g0g3eyALCGuGek/zrGZDRCgAfEHilX6v84r3e5lSC3zT3h25xWbwkAYI D4y/SHS5Uy9aBoa2XhUrck052GVLH16pT4wE4tN+ryjxV2QkGkce5DBaLsQFYTqmdbBw NKlxNHjU7zh316+jv/lX1J1fpox+XBIV89aIRNJ+1TpnXy6/7vl0vj9FrFtVNhEDxaBz Eom2ivRLSrTSuqX7hTRnNlqH9fsH9+j3jtPqaFqcDT2Icx1pR801gsiJmZu0tYfUk0v/ 4SwQ== 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=VqO9H1/NuCJsmES/XL+Jj4hIqulm9bVFfdmDriTo558a4+cToT3gJuP90ecWwML/Wd upCzf1E3dznE7n5de4k2z5/so54hy9Lc3Im9v5bw7I0NesYO9wRPHmdU/MRnHrtmBgI6 EksQzartN7hJmjrYVyiyhdwpIujxD35kQRXQ3mPgOKIC1+WGYoPYJD5vRQE/oEAU9OxP H/WWdx8nlDmQixbW9ZUdp9fEtiwlutrIHYnnSc3GCG7geynswtLL820A7tlp6BGlGkg1 r2S9btF4xX+Kmz/nrFtWyrdAX2skgsvw/Sz+z9KJcXSaafqVMpA65d2r27USIsq6A99Y WH9A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id z127si321883wmc.1.2019.05.23.04.39.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 04:39:58 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id x4NBdvru032348 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 May 2019 13:39:57 +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 x4NBdvWH032541; Thu, 23 May 2019 13:39:57 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 3/6] isar-bootstrap: fix DISTRO_APT_PREMIRRORS regex in case of cached build Date: Thu, 23 May 2019 13:39:46 +0200 Message-Id: <20190523113949.20080-4-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523113949.20080-1-claudius.heine.ext@siemens.com> References: <20190523113949.20080-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Bm2iLrH9WQio 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