From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: isar-users@googlegroups.com
Subject: Re: [PATCH 1/2] isar-bootstrap: Keep the initial APT sources list
Date: Wed, 19 Dec 2018 14:45:13 +0300 [thread overview]
Message-ID: <5bd08067-fa48-1703-20c3-71bf6b48e52d@ilbers.de> (raw)
In-Reply-To: <20181217054034.12236-1-mosipov@ilbers.de>
On 12/17/18 8:40 AM, Maxim Yu. Osipov wrote:
> Keep the initial copy of APT sources list passed
> via DISTRO_APT_SOURCES as the contents of APTSRCS
> get modified during isar-bootstrap.
Applied to the 'next'.
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
> meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 2 ++
> meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 2 ++
> meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 +++
> 3 files changed, 7 insertions(+)
>
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
> index 19b60dc..7b83f80 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
> @@ -34,8 +34,10 @@ python do_apt_config_prepare() {
> aggregate_files(d, apt_preferences_list, apt_preferences_out)
>
> apt_sources_out = d.getVar("APTSRCS", True)
> + apt_sources_init_out = d.getVar("APTSRCS_INIT", True)
> apt_sources_list = (d.getVar("HOST_DISTRO_APT_SOURCES", True) or "").split()
>
> + aggregate_files(d, apt_sources_list, apt_sources_init_out)
> aggregate_aptsources_list(d, apt_sources_list, apt_sources_out)
> }
> addtask apt_config_prepare before do_bootstrap after do_unpack
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb
> index 3631506..c264123 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb
> @@ -33,8 +33,10 @@ python do_apt_config_prepare() {
> aggregate_files(d, apt_preferences_list, apt_preferences_out)
>
> apt_sources_out = d.getVar("APTSRCS", True)
> + apt_sources_init_out = d.getVar("APTSRCS_INIT", True)
> apt_sources_list = (d.getVar("DISTRO_APT_SOURCES", True) or "").split()
>
> + aggregate_files(d, apt_sources_list, apt_sources_init_out)
> aggregate_aptsources_list(d, apt_sources_list, apt_sources_out)
> }
> addtask apt_config_prepare before do_bootstrap after do_unpack
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> index 811d50e..f411ad1 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> @@ -20,6 +20,7 @@ DEBOOTSTRAP ?= "qemu-debootstrap"
> ROOTFSDIR = "${WORKDIR}/rootfs"
> APTPREFS = "${WORKDIR}/apt-preferences"
> APTSRCS = "${WORKDIR}/apt-sources"
> +APTSRCS_INIT = "${WORKDIR}/apt-sources-init"
> BASEAPTSRCS = "${WORKDIR}/base-apt-sources"
> APTKEYFILES = ""
> APTKEYRING = "${WORKDIR}/apt-keyring.gpg"
> @@ -222,6 +223,8 @@ isar_bootstrap() {
> install -v -m644 "${APTSRCS}" \
> "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"
> fi
> + install -v -m644 "${APTSRCS_INIT}" \
> + "${ROOTFSDIR}/etc/apt/sources-list"
> rm -f "${ROOTFSDIR}/etc/apt/sources.list"
> mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d"
> install -v -m644 "${WORKDIR}/isar-apt.conf" \
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
prev parent reply other threads:[~2018-12-19 11:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 5:40 Maxim Yu. Osipov
2018-12-17 5:40 ` [PATCH 2/2] classes/isar-image: Replace the apt sources file with the original Maxim Yu. Osipov
2018-12-17 11:42 ` Henning Schild
2018-12-17 11:41 ` [PATCH 1/2] isar-bootstrap: Keep the initial APT sources list Henning Schild
2018-12-17 13:15 ` Maxim Yu. Osipov
2018-12-19 11:45 ` Maxim Yu. Osipov [this message]
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=5bd08067-fa48-1703-20c3-71bf6b48e52d@ilbers.de \
--to=mosipov@ilbers.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