From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:ac2:4207:: with SMTP id y7mr698881lfh.7.1545219921306; Wed, 19 Dec 2018 03:45:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5d9d:: with SMTP id v29-v6ls2450059lje.12.gmail; Wed, 19 Dec 2018 03:45:21 -0800 (PST) X-Google-Smtp-Source: AFSGD/XKrJxkaF0YNgnNP+wMLewmDhL3hwmkUNWjnS9tFHPH9vFuH5+V3OO0/o7tIs2MvATLwYpB X-Received: by 2002:a2e:8112:: with SMTP id d18-v6mr1776103ljg.10.1545219920993; Wed, 19 Dec 2018 03:45:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545219920; cv=none; d=google.com; s=arc-20160816; b=AT9hdHM0jtmqkPSqp0E7hLtoGAiQ0DzAsLQYPasEu8QRdovSH24J+tJjUHKDmnmvQE Z2VOpUwuP+eyuBiOwAhJj2bdbQ3UL0WhJhaTMgEoVKa7bGPM2AtvHni4DAMeRC7ueytp /KYwSOj9qYnVRYQ1EsmH+i/zCSP5mUnQur0g63B4pslLgCWFulIKfMUAF2sCmFrosUaA JIdOmRbQdmHqJcmjIGb5A75vrrRqVA+G1yBkVruAUVih4GyItyRVx5MpwhEQ17rymRPf H8phWUQ7rbi/Xt/g6Eixg9Gqe7Qddu73H/xKcsr49E3sHnDTb2uwJS1E2dfJsJ/u0IQo z5nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:references:to:from:subject; bh=iNxYL0Zrvu7kqTJAAUajgvL3IPSqU/qqiYFATy9wUug=; b=VCAglFvowERx6V/Kvu/cEdcnruJbiJWLjXQcffv+yXXYw4uo4wWgFpyDnZyNThyEef 8orKfLcFqcybSVO+6zHQa7tCGBbJ66JhO7dGTxnJj+RxNtTpcBaSPGE32HeA3NiUex4b YuN/BZUblofM0SNySiKledn2RiAwXLFay+0Tmtk0IW1NN3q4NQejACX5tRR7kqVCb2fp +y1MVovDVulEsqCx7U6Dgb9UkFnSfR7nBFmxU2mtlo7EL2Fbx+JVO00bMJ+YcahIx4Xx LgaOV51YO1Vrm3I5cdUK9UOXFAM64zN6Eo6aW2iJWXVZ+RMPPisFDS5cf5DtYXg9vk+Q vEHw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id 205si704440lfb.2.2018.12.19.03.45.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 03:45:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.180] (nat-ppp-217.71.235.199-satnet-spb.ru [217.71.235.199] (may be forged)) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wBJBjIZr010476 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Wed, 19 Dec 2018 12:45:19 +0100 Subject: Re: [PATCH 1/2] isar-bootstrap: Keep the initial APT sources list From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com References: <20181217054034.12236-1-mosipov@ilbers.de> Organization: ilbers GmbH Message-ID: <5bd08067-fa48-1703-20c3-71bf6b48e52d@ilbers.de> Date: Wed, 19 Dec 2018 14:45:13 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <20181217054034.12236-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: WycANG4sD7gz 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 > --- > 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