From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7185526140083109888 X-Received: by 2002:a25:3249:0:b0:6f0:eb40:fca4 with SMTP id y70-20020a253249000000b006f0eb40fca4mr1416585yby.391.1673010676526; Fri, 06 Jan 2023 05:11:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:690c:d81:b0:3fe:c52c:dd9a with SMTP id da1-20020a05690c0d8100b003fec52cdd9als1047439ywb.4.-pod-prod-gmail; Fri, 06 Jan 2023 05:11:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXv0UGZb4xkcPAimIkjohrKgbLT3ia8gewUBOObKpKbTV8jZMwvjtVvH+sot7xdm04/QVx6f X-Received: by 2002:a05:7500:69d:b0:ed:eb8c:d912 with SMTP id bv29-20020a057500069d00b000edeb8cd912mr2913976gab.22.1673010675633; Fri, 06 Jan 2023 05:11:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673010675; cv=none; d=google.com; s=arc-20160816; b=ly56LLbY76tCftThhLTvTPnxSG1jGEEKxcWA9JijaPLhxDL1EQhwTv4X1NFME1282p gVcuKehhh2NKeN6cK6QphZBkcjnJ+BGdf4CBbTWXbzWd7IJLp8sxx0wPSJbm7qTg+fZt 8ErVcTsS7rTFR49Dija4I+sjggY1UIlB/vfL1Mh0DgzQC0dFNyc4SB8Nea+QV6JL2kl/ IxLNFee8tF7muIWl37gXXlSLFmfWvlNQ+GiOBzKPh0RnUKuyUm5s2yDmfmx2dMB26UD5 HXoIzYGrYMDI/04Ax/F5pB5kgeIkXp+q8gKE+z0qQEOmHDds/aHeSLCeWnpFFXHXhvEg Mj1A== 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=0eCFW4UWXkHKVT1UOZb1SymjNy9VqO2lZuPAULSTaOQ=; b=ZspDX/sQ/5ej9wc61m/SHm3moIOtV44Z8P0DS2lIBNhqCxeyoeV4KJZhOdKWIc/MUg 4GHNbmsjgLFGhmMaIXqlfRcYnVoLUG00oTD865c2NTaKGGjjzw8dhM6h32EOeiBYcV4t qBGLy73HBFwc7+1wELuBpTzSYpfLW5ewUUTiMIDa+ncUrzE1Re8FeKmF34kveJmpklOa K5KiAnDkMWGaVC9r1mtUp0ZAXljBi6UsNEEhgEUW1Gownm6IAMy5JlDGdLv/L8JxzDZl pXk51KbnLfv/2l2ms41QJ5sGs3+8WqJzuC203FY/uWyAWxp26WKj/aiSR5pQZQUbX1XN eRLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.164 as permitted sender) smtp.mailfrom=roberto.foglietta@linuxteam.org Return-Path: Received: from relay03.th.seeweb.it (relay03.th.seeweb.it. [5.144.164.164]) by gmr-mx.google.com with ESMTPS id c19-20020ab06ed3000000b00414ee53149csi123698uav.1.2023.01.06.05.11.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 05:11:15 -0800 (PST) Received-SPF: pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.164 as permitted sender) client-ip=5.144.164.164; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.164 as permitted sender) smtp.mailfrom=roberto.foglietta@linuxteam.org Received: from localhost.localdomain (unknown [IPv6:2a02:8071:3187:7b80:1035:7147:9529:4b60]) by m-r1.th.seeweb.it (Postfix) with ESMTPA id 5E49F1F68E; Fri, 6 Jan 2023 14:11:13 +0100 (CET) From: roberto.foglietta@linuxteam.org To: isar-users@googlegroups.com Cc: roberto.foglietta@gmail.com Subject: [PATCH v2] image: make sure do_rootfs_finalize can run multiple times, v2 Date: Fri, 6 Jan 2023 14:11:06 +0100 Message-Id: <20230106131106.3266668-1-roberto.foglietta@linuxteam.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: HcBB3OdMOtyP From: "Roberto A. Foglietta" image: make sure do_rootfs_finalize can run multiple times, v2 v2: essential code, only Signed-off-by: Roberto A. Foglietta --- meta/classes/image.bbclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 629a0c1..b7a7900 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -424,10 +424,8 @@ 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" + mv -f "${ROOTFSDIR}/etc/apt/sources-list" \ + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" || : EOSUDO } addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess -- 2.34.1