Re: [PATCH 1/2] isar-bootstrap: Keep the initial APT sources list

["Maxim Yu. Osipov" <mosipov@ilbers.de>]

On 12/17/18 2:41 PM, Henning Schild wrote:
> Am Mon, 17 Dec 2018 06:40:33 +0100
> schrieb "Maxim Yu. Osipov" <mosipov@ilbers.de>:
> 
>> Keep the initial copy of APT sources list passed
>> via DISTRO_APT_SOURCES as the contents of APTSRCS
>> get modified during isar-bootstrap.
>>
>> 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"
> 
> That file should get another name, and ideally not sit in the rootfs at
> all. If something goes wrong, this looks dangerously close to a valid
> file, with no clue where it came from.

One may try generate this sources-list from DISTRO_APT_SOURCES again in 
isar-image.class (one have to share python aggregate_files & friends 
and add another task similar to do_apt_config_prepare from 
isar-bootstrap-*). In my opinion such duplication looks ugly as the 
natural place to parse DISTRO_APT_SOURCES once during isar-bootstrap phase.

Maxim.



> Henning
> 
>>               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