From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:a1c:e308:: with SMTP id a8mr728666wmh.14.1545219942471; Wed, 19 Dec 2018 03:45:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:950d:: with SMTP id x13ls375849wmd.7.canary-gmail; Wed, 19 Dec 2018 03:45:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/UinYWl5TcyQe/0FKJFA3Igu97kP0KfJ/NX+IpD97YSOAl/UIqIH6R37i0Pts+gSmRyNBP3 X-Received: by 2002:a1c:c284:: with SMTP id s126mr771447wmf.5.1545219941928; Wed, 19 Dec 2018 03:45:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545219941; cv=none; d=google.com; s=arc-20160816; b=A13Hi+mZy4SxT8sjO4YWq6kFZY/NHbYU7lsPp4xT+NLemIrbjSmC7mtLNrxdspN3mp sqCwL1O47ka2VFDvkvr0ivnalRPcu9cLkhFRMOpbqXYl8ipVRkgJAcyBvTj1t6g6q7w5 Om1ye2CWQl7Q9tqtYzIkmwwxZ/aWrYdedJCRwLvx8tsBgrRUv/tN77tUrp9pVRzyiPXf isYUSk88LQP7R7Y0G6+Srejq2XSoFYo73L0OQ7vJtJeVDNWZbiItlWVBZogvCXTGZkVM ztf7rZ8kO7t2phS8Cohdu5r3dfdBJSCUWiM5j8r7tRIUmI2sLJms12R4Gp/Uy3zlD2m6 RasQ== 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=1kdf7uG52zLSuwljVJNBOOzxNb5iGiGJyqwz4O9Qkss=; b=D52wExjs6hRWQrccRBKiM3Tv0yY3KzGb2DXRf+vj/mTx+JZGXKQduWViCkvUH7Lu/Z reYXN9bzeAk2Qi4n+fXJ0VR3CMJc3ngWBXF0/BdSWf6EXAlLZYSF4u942RxYdgX7FwK1 YAnkvV/nDB9vPFmP/szqbRKSGuw/vDQwNEdD804aNUIVBHCfo3Oub9m/aOKGItaeO9vl vr27mHR0iLN8L/cEFfLvAQF1cYTVA+eUdKRn9ja+/xaIrw4ee4NmrC+4baRH5DB7js6h o/4Z933hjqFMdOzcfncQvEu/DeDIYws6nRqcTnFhgEhJkH397G8hrd6ds0oQQUmf99ii 58MQ== 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 j45si151949wre.0.2018.12.19.03.45.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 03:45:41 -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 wBJBjdNI010479 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Wed, 19 Dec 2018 12:45:41 +0100 Subject: Re: [PATCH v2] classes/isar-image: Replace the apt sources file with the original From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com References: <20181218170313.23977-1-mosipov@ilbers.de> Organization: ilbers GmbH Message-ID: <82dbc614-795c-f9f7-a266-7aa9b80d7b1b@ilbers.de> Date: Wed, 19 Dec 2018 14:45:34 +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: <20181218170313.23977-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: yGRliAUYM2vf On 12/18/18 8:03 PM, Maxim Yu. Osipov wrote: > At the final stage of image generation replace the local apt sources > file used for bootstrapping with the original APT sources list > defined via DISTRO_APT_SOURCES variable. Applied to the 'next'. > > Signed-off-by: Maxim Yu. Osipov > --- > meta/classes/isar-image.bbclass | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass > index 81738ff..4992800 100644 > --- a/meta/classes/isar-image.bbclass > +++ b/meta/classes/isar-image.bbclass > @@ -66,7 +66,13 @@ isar_image_cleanup() { > if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > sudo umount -l ${IMAGE_ROOTFS}/base-apt > sudo rmdir ${IMAGE_ROOTFS}/base-apt > + # Replace the local apt we bootstrapped with the > + # APT sources initially defined in DISTRO_APT_SOURCES > + sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources.list.d/base-apt.list" > + sudo mv "${IMAGE_ROOTFS}/etc/apt/sources-list" \ > + "${IMAGE_ROOTFS}/etc/apt/sources.list.d/bootstrap.list" > fi > + sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list" > } > > do_rootfs() { > -- 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