From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187242631035879424 X-Received: by 2002:adf:e18d:0:b0:2bd:c4ce:e4b2 with SMTP id az13-20020adfe18d000000b002bdc4cee4b2mr850704wrb.47.1673840169748; Sun, 15 Jan 2023 19:36:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4943:0:b0:298:bd4a:4dd9 with SMTP id r3-20020a5d4943000000b00298bd4a4dd9ls5373213wrs.1.-pod-prod-gmail; Sun, 15 Jan 2023 19:36:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXsh9WvvlBca9lOXZfE1uGA5fa4aElVDfXEg5OBnGRTxqIbYIO849CcwOs+/vJ4C23XYlspf X-Received: by 2002:a5d:4dca:0:b0:2bc:7fdd:9248 with SMTP id f10-20020a5d4dca000000b002bc7fdd9248mr16960991wru.9.1673840168396; Sun, 15 Jan 2023 19:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673840168; cv=none; d=google.com; s=arc-20160816; b=go3gS6I1LjzD0643ZghMGaKWwZE78GAc+f5RnPysHBMnPdqdo4etM2c2LHqmfut2/x SQ8HUFQihyw9ffoGfMQCrNWlGJAQW74hIaUvBl1JG0GikC1YcLw4Ub7MVlT3MYMAHhM0 y1uo5OOQQdtSkM7bnhP0DCsWgKDVMByFgA3USYiX6JB5HoE3mzIY/UrJ0j7QtffaA9l/ q6lF4eC7FbCaFPMpuyXJqfb0cB0RgW2jbgfWzRPhN4IUJYdZ1uhpKe8KyP5ssbI0VyZr XZ0htmk2cS18ZrSTbiWMtgCnBtN2ATFzJ4hGeHdU36Jzwvg8sbvOVI7iPrnNxriVw1Vc jxvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=nRNVJ2knKWu4At7zeuirY9Wcy+amynuFS45LkZcGYmQ=; b=F7Mnhgyg2X3nrI9lidZ6W+xEuYhkUDKGw/Br8CuqAuuHpPkZ9oM0JvumA0uDLX5/yc dY7uSf83iF8uSxz2KyVojfKbJZRDiPF+hT14kj1131310/2McbkNuRwZ+Evo+KvPW5Iw W0BmuxV7H6Ak/aPVcVo/eX5g4HOoXavIzNP1xyA54i9kG7zR/1zWfRInUBLPJ/zvUR+H nRvzXbVeLgmlN4LgAtMw8SA7uC7HS0R81K6oTey2+Ibi1HtcF1D/zmSfCgr42KyQ1zOl ty1ggWFFoQRMTIykjZDUFPt6LJMT13ztAZalufWzE1Ui38Zx3LHtdz65wqUrziRVqgVU 82BQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=UugC2Rfh; spf=pass (google.com: domain of fm-72506-20230116033608f90f49b5c3d960d353-j6knkn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230116033608f90f49b5c3d960d353-j6knkN@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id ba30-20020a0560001c1e00b00241d0141fbcsi1311406wrb.8.2023.01.15.19.36.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jan 2023 19:36:08 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230116033608f90f49b5c3d960d353-j6knkn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=UugC2Rfh; spf=pass (google.com: domain of fm-72506-20230116033608f90f49b5c3d960d353-j6knkn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230116033608f90f49b5c3d960d353-j6knkN@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20230116033608f90f49b5c3d960d353 for ; Mon, 16 Jan 2023 04:36:08 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=nRNVJ2knKWu4At7zeuirY9Wcy+amynuFS45LkZcGYmQ=; b=UugC2RfhOgLkqlVc4UkYkpJUB1kIx0xrG9mL8iof9b99wM+ivxdJXAnaM4Jez/TBae9HPk aaT9jKx95mrKTjZbgFBi4BTgn79PHxxdeyv1Yc8CObd4+FUwdQnxjQfCTYTrCR4u4lFDNIdn FAXJdh3n8NFT8Xlpm7e61cP8wDKwU=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, daniel.bovensiepen@siemens.com, henning.schild@siemens.com, venkata.pyla@toshiba-tsip.com Subject: [PATCH v3 01/10] image: make sure do_rootfs_finalize can run multiple times Date: Mon, 16 Jan 2023 03:35:43 +0000 Message-Id: <20230116033552.139048-2-felix.moessbauer@siemens.com> In-Reply-To: <20230116033552.139048-1-felix.moessbauer@siemens.com> References: <20230116033552.139048-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: 4gbVeR2/CSkn From: Henning Schild There have been several places that would not work twice in a row. All the test && not covering || have been moved to if. The rm at the end tried to remove a file that was just moved. And that mv would not work a second time because its source would be gone. Signed-off-by: Henning Schild --- meta/classes/image.bbclass | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 629a0c1..125eba1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -396,13 +396,16 @@ addtask deploy before do_build after do_image do_rootfs_finalize() { sudo -s <<'EOSUDO' set -e - test -e "${ROOTFSDIR}/chroot-setup.sh" && \ + + if [ -e "${ROOTFSDIR}/chroot-setup.sh" ]; then "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}" + fi rm -f "${ROOTFSDIR}/chroot-setup.sh" - test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \ + if [ ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" ]; then find "${ROOTFSDIR}/usr/bin" \ -maxdepth 1 -name 'qemu-*-static' -type f -delete + fi mountpoint -q '${ROOTFSDIR}/isar-apt' && \ umount -l ${ROOTFSDIR}/isar-apt && \ @@ -424,10 +427,10 @@ 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" + fi EOSUDO } addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess -- 2.34.1