image class bugfix: interuption does not break the rebuild

Message ID	20230105190654.2760731-1-roberto.foglietta@gmail.com
State	Superseded, archived
Headers	show Return-Path: <isar-users+bncBDWOH7WUCQINLP64TUDBUBCTXXDZ4@googlegroups.com> Sender: isar-users@googlegroups.com Received-SPF: softfail (google.com: domain of transitioning roberto.foglietta@gmail.com does not designate 2001:4b7a:2000:18::169 as permitted sender) client-ip=2001:4b7a:2000:18::169; From: roberto.foglietta@gmail.com To: isar-users@googlegroups.com Cc: roberto.foglietta@gmail.com Subject: [PATCH] image class bugfix: interuption does not break the rebuild Date: Thu, 5 Jan 2023 20:06:54 +0100 Message-Id: <20230105190654.2760731-1-roberto.foglietta@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com
Series	image class bugfix: interuption does not break the rebuild \| expand image class bugfix: interuption does not break the rebuild

Message ID

20230105190654.2760731-1-roberto.foglietta@gmail.com

State

Superseded, archived

Headers

Sender: isar-users@googlegroups.com
Received-SPF: softfail (google.com: domain of transitioning
 roberto.foglietta@gmail.com does not designate 2001:4b7a:2000:18::169 as
 permitted sender) client-ip=2001:4b7a:2000:18::169;
From: roberto.foglietta@gmail.com
To: isar-users@googlegroups.com
Cc: roberto.foglietta@gmail.com
Subject: [PATCH] image class bugfix: interuption does not break the rebuild
Date: Thu,  5 Jan 2023 20:06:54 +0100
Message-Id: <20230105190654.2760731-1-roberto.foglietta@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list isar-users@googlegroups.com;
 contact isar-users+owners@googlegroups.com

Series

image class bugfix: interuption does not break the rebuild | expand

Commit Message

Roberto A. Foglietta Jan. 5, 2023, 7:06 p.m. UTC

From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>

image class bugfix: interuption does not break the rebuild

Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
---
 meta/classes/image.bbclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d72b8fa..b04826b 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -428,10 +428,11 @@  do_rootfs_finalize() {
         rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list"
         rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar"
 
-        mv "${ROOTFSDIR}/etc/apt/sources-list" \
-            "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"
-
-        rm -f "${ROOTFSDIR}/etc/apt/sources-list"
+        if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then
+            mv  "${ROOTFSDIR}/etc/apt/sources-list" \
+                "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" || :
+            rm  "${ROOTFSDIR}/etc/apt/sources-list" -f
+        fi
 
 	BTROOTFS="${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target"
 	for i in $(ls -1d ${BTROOTFS}/*/rootfs/ 2>/dev/null || true); do

image class bugfix: interuption does not break the rebuild

Commit Message

Patch