From patchwork Thu Jan 5 19:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roberto.foglietta@linuxteam.org X-Patchwork-Id: 2409 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 05 Jan 2023 20:21:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f186.google.com (mail-yb1-f186.google.com [209.85.219.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 305JLPmk009381 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 Jan 2023 20:21:25 +0100 Received: by mail-yb1-f186.google.com with SMTP id e12-20020a25500c000000b007b48c520262sf3292614ybb.14; Thu, 05 Jan 2023 11:21:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672946479; cv=pass; d=google.com; s=arc-20160816; b=Eoczbs+/ixbmOJC+36mdBbZLXsPyycZzJWbzSoGmGVo3Tytot9K0TWtb9Gjj4fMABy ldc9peabbbKj0QmGvYwZmfRvvqdaQgyEYP78GiyIHqSnQAP2hAQ8+8qUr6viHwIaePp/ bNjmu2oZpvICTDUeEhl3l3gV6vB9YtjBtT2+5g2eyNmd8PrpcXFaUFlmjtSORo88isat gK+ypMmGuGQ3rKU+vXSgHFA6afHsxqPyslWph9ioGBxcGg+6BzVPOl5Oqw0nWMSl0gPb 1VNEZ7VqOZRkOjbhh07V6GxXeBEB24Vs1F2oML61yAQohTvEowLtgbQGA1JLE21OIZKK eYQw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=GEooTrqVMsN8W+fXgQnJyeEU06MdXfLln7uOUt0m61k=; b=NDBXEVx/yfmPY9qJWZCS2YUb3z/XqkHqJMZr0QcusF5vf4XtYNGvXLK7Ni8+E3CghD 8g7/Q0pvteIF/aNqvuiJ8BvgchKsqCN/JPq6Zdt7xN/QJDNF1R6eBBAWbF++l4tyuY2K iP4+TZNcHKG2QT9NGEbsXJ7AOmSjds9a/EFw9OwEF7M/QKABAB7LWbGAXpgW/7pHKACD YkI0XdClx4AamhzMbL+Fg6QJWRmsGQ8J1/xc4F+N7E1Yb65B0mfU7zS735/JA6Za1CaN iPREqZvKbRmLuwIKfwiCSubFtWllV+meCKBalpNglo6IWog/BPzdukVWrk/DfeE+LUZL xBDg== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=GEooTrqVMsN8W+fXgQnJyeEU06MdXfLln7uOUt0m61k=; b=LJLEHgrP4333Zhn15iUAXuxXGQgzWP0UWNMXnHKtYbPTKTCzRU6S0t1ymmhgC9n6cP YHotqT/N1zIXqvXxT4g+qciUGn/6SrHFtrkwqGynyFSx+uUibWAzy2y64BsOxYFi69xa fNbJpjcNxayhRzOgGk9O/zogRA/OoyhCNFg0cFA7RUtJyIWdsRHNgBOc9h5UGXT660OI eGPezfBi0Y0jAYTx1/VRd+xUHHfz0SObmnCAXMqqvW55zG41nKl9jLmxZLgDSjKT1CjA wToTRCZTNVgUCp3mI7uJ7Rl0OmAX/dRk70xh4Llrg1mHmz4ghICJa7fyJE9fezHfShuE N82w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=GEooTrqVMsN8W+fXgQnJyeEU06MdXfLln7uOUt0m61k=; b=hQpXa+OMHbGkInuI1ZaOXOm1NAd/D1L9cP+k0ChGyhlp3kocYGzvRmwD4XxrfBN/pO IdDgPcjffCnvlsluGyA7Di3qXwVBXDe+PpUMW5ePE/TKMwluGhAzDypX//oPvM+eoA9i NKpLU79qb/c1t1mwoZrN3XhCusXTEknyfaUIkQaN/9nU2foJ0NK1S0G8CMpfDdPVxZWM T+pLSvJ/sQ0w8TPZseNG7idNqpnz8QztidrIRJrA6uuFCAq6dThUHn5/M63vrkCbcK86 zIUAcnpo/NR/2V2/9w1muuaAZ3dUVyfF28VXEiqKlyNR50h6Ysd9hn55mOfznV9ZDmA3 r5sw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kq04SjmIJFjdwqBhUa0hwaMAuXpGsEvYf6hOSwQzuCte8yxDZ4x ARtWWYU4uw/gFySJ4Ipvea0= X-Google-Smtp-Source: AMrXdXt/tX/rbFyfRcOeVKBOnccNbHmFkse34eALZltg7FrYfFf7M6Mfio5Tf6fhigaAcXXHaKxpvw== X-Received: by 2002:a05:690c:d1c:b0:488:7800:3b03 with SMTP id cn28-20020a05690c0d1c00b0048878003b03mr5177083ywb.209.1672946479524; 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-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 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; 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 X-Original-Sender: roberto.foglietta@linuxteam.org X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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