From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:a1c:2d07:: with SMTP id t7mr428502wmt.17.1545152607667; Tue, 18 Dec 2018 09:03:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:88c5:: with SMTP id k188ls56417wmd.4.canary-gmail; Tue, 18 Dec 2018 09:03:27 -0800 (PST) X-Google-Smtp-Source: AFSGD/Wm6nGzWFIfSlsz6TcTaKjvxjkpFwfDynxTxSUVK83qj2ECaqyjQn+8Ey0D4XTLB0VyXXFe X-Received: by 2002:a1c:c91:: with SMTP id 139mr489490wmm.9.1545152607280; Tue, 18 Dec 2018 09:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545152607; cv=none; d=google.com; s=arc-20160816; b=Ej2ZWR+FuJi0OuoYT9tRU8WjBOa48r57ylq10XS2ZyYwU/VoDuvL4PVogPZbS/S3Is zg/zHm2DyUU8jMzhGbaLGxkUlZise6YH6k/NN6FRKJpFlicqABtqxOjHuZ4C0vzdvFV7 AKk11ACYQKVwKb4u7b8FJbC5aS3og1zh5NTuV0rR5UExNQYR96bsfRETtNB3t6xw21WG mFYQ7queTh6AihLJovQjGh3UOhHNeGr6sX7Xo+ofz/NstX65CUKKWY7HmptJt0ADjvGw 4SOO1Xjf4wQRwtD6gboSWNpH+FEBCX255/u2qEl6VFMI64bLH60jgTtKFA8dPJycsy4x 0X5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=rqECdatjtV9gr+x6er1H8q5a33rlZ1FwuRIMwy28wdw=; b=NP9NICPSXZUNJkzmJxV1zU9libQXHv5oCQdA4ORO73KRfkZmE96xJgZKjsbruo9GFF /409Sd9QmrrCmkXImQNCVFhCBvv8f9ehHCDYlwujfZOdE14aw/c8PXqAEUJ8oE5h40TY 2jc6V7MkcAECPBm1zFjUyc/mQa62rrEt9kAPWstufg2aR65IQ59tvH9qgmOoP5Je1x6X TNElx7VZY+Y/BI1ZcAkFnlYpjcGFxBFH9ty1A1tL0sPIkjXbb5wKvyz0yTuS9ftuFX/V 2W4RnVJcAJMf174BsnnJ/oDvQI9C/wIrU8aNC6p1X37QSkMZ/Hp2jr2ifo4cDt7bTlbn u+Ug== 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 x13si207774wrn.3.2018.12.18.09.03.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 09:03:27 -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 azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wBIH3DZP008034 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 18 Dec 2018 18:03:26 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v2] classes/isar-image: Replace the apt sources file with the original Date: Tue, 18 Dec 2018 18:03:13 +0100 Message-Id: <20181218170313.23977-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: 021FvHhVdLlU 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 | 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() { -- 2.11.0