From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:a1c:2088:: with SMTP id g130mr1418863wmg.6.1545046951724; Mon, 17 Dec 2018 03:42:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:d78f:: with SMTP id o137ls12325wmg.1.gmail; Mon, 17 Dec 2018 03:42:31 -0800 (PST) X-Google-Smtp-Source: AFSGD/XmMyR5UctdmfJnJUMt9Z9eNk/8r8DPehIWx4ZrxIMVyCNy1UMnfpA/JhxYxyfpzgFaAD4u X-Received: by 2002:a1c:9cc3:: with SMTP id f186mr1615651wme.11.1545046951297; Mon, 17 Dec 2018 03:42:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545046951; cv=none; d=google.com; s=arc-20160816; b=zq+GVASAfcT+bMEtjxz40kJyIR7kd1Q+G5mEHJPcyMRb0GBjZXKcfbA8fN94mHPF0u gJlIFn13lNnSH4+Q2incTp+xuj+a6VnQ4o87I4wsqe/6niUvzjUvc0ch+iIzWC6dtAUH 4yHy0NVQMHb0e26hrSU0TMGzdmwV18sK16hXMo6KC2AWaIAZ7VJK1hfrS3W5l6KXenKJ /XRyJh7nTmBv/CGV20nPPPcP/iRs25WLp0NCnBOKFnHhlRmeM2Vl+GGQaSRJFkn3kx8x EFupqg1lIsmqfNfW0scZdnExOo2Foz8SuCVtkpeeBrGLbJ8Je2ODpd05+MXbyDgrPSgo 6axQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=Ka3qRWhd9WVBBQWW/PEx3fSdJK0rwkZ8WNRM09vYucs=; b=fNZSLUHYObRZgllRUN3zx8oOLc/KQ5Z+wdlFNAe6oFSjr+Gq5uldGj8plWe6VP8yH2 1QortLf4LdNWNNPquS++uM1quvkuovPfIgVIhQ0leOqUwxA6ua78hm0AoCgSsAPMUsoO jo5WX4GM/wdL0d6WXmv9v2+VxrNEZAPmpQ2qRxS8iiqC9nXa8TZcj3HUYI2bAUi1NuVD GEHM5hQzMr3mdNufJ8aZpRmfQgwQjJQpQkfeOU5JREKfeGurpWhKtCkIpJIW5N+bYzrA bmbNqdrR2KvRBDcTB9Jsg/OtZf9XV1OK8+rHMGSCZUerwTFNdXNoTGH5O6DnSYJr2dA9 QQug== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id k39si571204wre.2.2018.12.17.03.42.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Dec 2018 03:42:31 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id wBHBgUjw024111 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Dec 2018 12:42:30 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.108]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wBHBgUnb028382; Mon, 17 Dec 2018 12:42:30 +0100 Date: Mon, 17 Dec 2018 12:42:29 +0100 From: Henning Schild To: "Maxim Yu. Osipov" Cc: Subject: Re: [PATCH 2/2] classes/isar-image: Replace the apt sources file with the original Message-ID: <20181217124229.5d85144d@md1za8fc.ad001.siemens.net> In-Reply-To: <20181217054034.12236-2-mosipov@ilbers.de> References: <20181217054034.12236-1-mosipov@ilbers.de> <20181217054034.12236-2-mosipov@ilbers.de> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: fYd5dbFd9ish Am Mon, 17 Dec 2018 06:40:34 +0100 schrieb "Maxim Yu. Osipov" : > 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. > > Signed-off-by: Maxim Yu. Osipov > --- > meta/classes/isar-image.bbclass | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/meta/classes/isar-image.bbclass > b/meta/classes/isar-image.bbclass index 81738ff..4193d97 100644 > --- a/meta/classes/isar-image.bbclass > +++ b/meta/classes/isar-image.bbclass > @@ -66,6 +66,11 @@ 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 > } And here we keep sources-list in the !cached case forever ... Henning >