From: claudius.heine.ext@siemens.com
To: isar-users@googlegroups.com
Cc: Claudius Heine <ch@denx.de>
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 [thread overview]
Message-ID: <20190523113949.20080-4-claudius.heine.ext@siemens.com> (raw)
In-Reply-To: <20190523113949.20080-1-claudius.heine.ext@siemens.com>
From: Claudius Heine <ch@denx.de>
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 <ch@denx.de>
---
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
next prev parent reply other threads:[~2019-05-23 11:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 11:39 [PATCH 0/6] Fixing base-apt and ci claudius.heine.ext
2019-05-23 11:39 ` [PATCH 1/6] sdkchroot: remove 'copy-package-cache' from ROOTFS_FEATURES claudius.heine.ext
2019-05-23 11:39 ` [PATCH 2/6] bitbake: added DISTRO to REPO_BASE_{DB_}DIR claudius.heine.ext
2019-05-23 11:39 ` claudius.heine.ext [this message]
2019-05-23 11:39 ` [PATCH 4/6] base-apt: fix issues with creating and using the base-apt repository claudius.heine.ext
2019-05-23 11:39 ` [PATCH 5/6] ci_build.sh: Remove rpi-stretch if CROSS_BUILD and REPRO_BUILD claudius.heine.ext
2019-05-23 11:39 ` [PATCH 6/6] ci_build.sh/repro: disable build of non-cached targets claudius.heine.ext
2019-05-23 11:59 ` [PATCH 0/6] Fixing base-apt and ci Maxim Yu. Osipov
2019-05-23 12:21 ` Claudius Heine
2019-05-23 12:26 ` Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190523113949.20080-4-claudius.heine.ext@siemens.com \
--to=claudius.heine.ext@siemens.com \
--cc=ch@denx.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox