From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:a1c:dc82:: with SMTP id t124mr1452258wmg.0.1545025256069; Sun, 16 Dec 2018 21:40:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:149:: with SMTP id r9ls3155837wrx.7.gmail; Sun, 16 Dec 2018 21:40:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/XdnXyvLG6rWmrp7sd+R5Pao+kBQx6i42OYMCIbliIawjEfcMQuotcNoJb3+A7mNIXS64pE X-Received: by 2002:adf:fa8c:: with SMTP id h12mr992522wrr.6.1545025255676; Sun, 16 Dec 2018 21:40:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545025255; cv=none; d=google.com; s=arc-20160816; b=xyzk87wB22DsyTI2jG0f/wJsfIpmq+rhNrHhaLvQ/AToCeJwLwbqCDKOchzlgiF6W8 u9KShdnQbAVmn4sh+hnQTo96ev9jI6+MHGwsSi7D7SMHnIfRTMCQIZ875bYh/CMuY3J8 9s0eXqZTOFaMgcKdq0/XKja1CIPWpt5mirObrgQrI+zmcOt8QCH8j+pfG+0uSie0S+Tp oVJ1I7+JT6q8PDWu1NUkaQaXsioJl0wLvqsuvzewmXOlV8NlmUzokWvoeqW4b3/M3NH4 4F7oFY2z86Y7ybOLrSwqlEAMmPjv6xu3AEQ8q2pnCaPWQoGv0q+GJZwKe7yA+GMS1vjU HThg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=H5ojNnuWYjRmsgkPiWy9nllup2P9CFW9XmYmJCCRtoc=; b=O0a/NqSMcuIzOL8fqBjWIKvglsavuEaIFSdoVrt8XvUWHDZiUYfhrQZtWPpAgSv740 m64tDuw3b8bt1oi2nGg3K/gxP5gVvDeidjuWLA4QuMJ+59hc22VB7v706FmjNDqtGmN1 P2YGQmnGcXIZuDBaiIqRAK3MNlrqyhetii+Nu0vYX7hH2k1v6F4iCm0yVbk2hawxoUid niWx38tIoPnapc1AmVJKfaoAgrAJ2+hvCADC9XpXruvUQlXZcj4BcT2Wy8mP5DCnft2M yEogxD4P2Nzr2H+2nLUShJGgimAdpCjkscW7Xr6bYX+CZcW+WQH5rZFZA+g1Rsw+44sF h1ww== 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 s124si408193wmf.0.2018.12.16.21.40.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Dec 2018 21:40:55 -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 wBH5eZWe003315 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Mon, 17 Dec 2018 06:40:54 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 2/2] classes/isar-image: Replace the apt sources file with the original Date: Mon, 17 Dec 2018 06:40:34 +0100 Message-Id: <20181217054034.12236-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181217054034.12236-1-mosipov@ilbers.de> References: <20181217054034.12236-1-mosipov@ilbers.de> X-TUID: d6DQfmAu3Sym 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 } -- 2.11.0