From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7185246735460990976 X-Received: by 2002:a25:cb90:0:b0:7b3:abe2:4e40 with SMTP id b138-20020a25cb90000000b007b3abe24e40mr705718ybg.402.1672946479611; Thu, 05 Jan 2023 11:21:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a0d:cd87:0:b0:3f6:22d4:3288 with SMTP id p129-20020a0dcd87000000b003f622d43288ls19238878ywd.11.-pod-prod-gmail; Thu, 05 Jan 2023 11:21:19 -0800 (PST) X-Received: by 2002:a81:81c3:0:b0:3e5:4d39:c2fa with SMTP id r186-20020a8181c3000000b003e54d39c2famr6019900ywf.337.1672946479147; Thu, 05 Jan 2023 11:21:19 -0800 (PST) Received: by 2002:a81:1745:0:b0:3f0:c4d5:2ace with SMTP id 00721157ae682-4c0e7fd2df5ms7b3; Thu, 5 Jan 2023 11:20:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXtmgsE2KLOxpznFxXAOZNA9uN43Zv1fR71v31RTmSSQyPmYB4LQPSsqXN3u+2OCq0IMLuD5 X-Received: by 2002:a25:a08a:0:b0:6fe:301f:13b1 with SMTP id y10-20020a25a08a000000b006fe301f13b1mr50913350ybh.41.1672946439544; Thu, 05 Jan 2023 11:20:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672946439; cv=none; d=google.com; s=arc-20160816; b=IJ+kq5cC3lE4eUhYfrfZFF4RQpG2up96Ek9jDWsZzwBESOl9+OZzd7Url+Dka57HHI jrfmx5tnfqOfWf4YzN7WL6FTWySJk76OS/rnRyqOuWjyukemhJG8BbISUbHvk9BxAY5R XWqYc2/wSVpCo70BhLt4tVJ1Zwcf5bCQUdy0jFkYaShoVqS4mCBVVSOCpWCnFZsjwJMW DrIk6CvvUj7bfwBBOOzy6C1+ChzDomI7so28TMWuSYi0AtfIcA9vK0pWQK0wXrU/Psog rzsPr+914tkN+bjc25U+GoPsXioPLFg0NWsB+rfnawdQl67qIm5H7yNPf0mhA9szpUVX otlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=0X3M9F/K/nIl6+koXhVHyortaALeKwi/vnB6sHuWzlE=; b=jCak1gdGIUltEnV1G1lh3HIUUCDW6t/YncHs+8Lvs7a0UQPRdHD1unTivb586PUljR VV+9grXFpL86SB3S6Erp4QCF6stspFZXxLMy7zQp1i0PaLiRAN7CMOwFuv9xsskUyKvF IUpc6ASr1fv6OcFTQFWHKn+XUAEAtHD29EBRUyZRZ0QFO4EQzldoBg7rVHUk8IkqBqOP 86jhvsULsru2ns8LOM8H70MFlOUh0GdzFDDZsXEUeueP5hG80K+k7fL2IJzZ2W4af/z2 71UrHeROLZxYjbatGq0yv4/NHEVinmPAxWBth3v7YPfvcUswg0Xsh5SWBR5iW5Cz/hl9 TJwQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.165 as permitted sender) smtp.mailfrom=roberto.foglietta@linuxteam.org Return-Path: Received: from relay04.th.seeweb.it (relay04.th.seeweb.it. [5.144.164.165]) by gmr-mx.google.com with ESMTPS id l140-20020a25cc92000000b007b62d9cf791si117691ybf.2.2023.01.05.11.20.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 11:20:39 -0800 (PST) Received-SPF: pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.165 as permitted sender) client-ip=5.144.164.165; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.165 as permitted sender) smtp.mailfrom=roberto.foglietta@linuxteam.org Received: from localhost.localdomain (unknown [IPv6:2a02:8071:3187:7b80:4cac:985f:1a32:e06e]) by m-r1.th.seeweb.it (Postfix) with ESMTPA id 7AE311F98E; Thu, 5 Jan 2023 20:20:37 +0100 (CET) From: roberto.foglietta@linuxteam.org 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:20:12 +0100 Message-Id: <20230105192012.2761557-1-roberto.foglietta@linuxteam.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: X6akGu2lCp3p From: "Roberto A. Foglietta" image class bugfix: interuption does not break the rebuild Signed-off-by: Roberto A. Foglietta --- 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 -- 2.34.1