From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187242631035879424 X-Received: by 2002:a05:6512:4da:b0:4b5:9182:9344 with SMTP id w26-20020a05651204da00b004b591829344mr3779106lfq.408.1673503014273; Wed, 11 Jan 2023 21:56:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:58f3:0:b0:49a:b814:856d with SMTP id v19-20020ac258f3000000b0049ab814856dls262581lfo.1.-pod-prod-gmail; Wed, 11 Jan 2023 21:56:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXtm6GQW/URL5jqv0VPYN3XiUi+e1vdHM98o6V/xb1K0emH+EPxY/tmyrsvyhOwDcMupy91V X-Received: by 2002:ac2:59da:0:b0:4b6:ea42:de0d with SMTP id x26-20020ac259da000000b004b6ea42de0dmr18770917lfn.39.1673503012938; Wed, 11 Jan 2023 21:56:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673503012; cv=none; d=google.com; s=arc-20160816; b=AtVK3l6vd/CwEvLx+W8PrqtYPE+DTtJNL0sDrRbA/R2dzcPFtO4jYG7IAHUttb/XaS 9nbPWk0TwCW/Y7+eYUYlQCsLCr5KZKK3wlVRpU2N/SdGE0QgnJT3JJ41X/P7cdxG7hfb Bf8nVcVWIgkJevjg9IhqpF2IqAqw+DdRT3leYF9/D1dhMoIt3uLtWShm/lfHP2OChTHn eeigjYB9PTvBihXQo3b7gx973tXFM/UKKS40HgB92F7/nD3e9PryxNWT7/BMn2rDaSuJ aR+1Zee1JUe1j57tI2vChwC9RQUGj1MBu89i5KpKuQ0STpNgRDB1zX1lWyld8O3fV5YZ rUng== 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=eil/bvohUejPmWynH7UnejU9DotN9ZkyRKIIXv8yAkE=; b=sBSn5zaP9DjIbOTTuwz+T3RmRWyL+Sy7RCtfudNksfMe4idJPOowaDmAepnay6O8q1 /FMc9D/zBXYiO4p1q7+aqiFq4C5K6NC2sAvmShuH45c/R+VWSll3dP6NphMiHdQxnudl UFolPsbDAbBnUy+z6Eym5qFvgWggyovyHXl3JUQ6LlllkG4JcSv72Ph3bhCck9OoolOG o7B2xQB4X9uSR3TfdKDlppOHuGtE21Gp58L0/v2EFT9ceJwhfFerEBKleQPR00a0sodD E0SOxC777oS4Pd2A6O4KFQO+KrCejTgeMIPqVf1RkZ9NP2KwluFl+/JfW5/cB8viqyUS xw7A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="AuPPx9/N"; spf=pass (google.com: domain of fm-72506-20230112055652d7d6f9a1cb4bb0c26a-08c_ah@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230112055652d7d6f9a1cb4bb0c26a-08c_AH@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id g2-20020a056512118200b0048b38f379d7si781853lfr.0.2023.01.11.21.56.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jan 2023 21:56:52 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230112055652d7d6f9a1cb4bb0c26a-08c_ah@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="AuPPx9/N"; spf=pass (google.com: domain of fm-72506-20230112055652d7d6f9a1cb4bb0c26a-08c_ah@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230112055652d7d6f9a1cb4bb0c26a-08c_AH@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20230112055652d7d6f9a1cb4bb0c26a for ; Thu, 12 Jan 2023 06:56:52 +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=eil/bvohUejPmWynH7UnejU9DotN9ZkyRKIIXv8yAkE=; b=AuPPx9/NXBdJ2w+gL5y73FQvJZP8ff5+inPewieGwA/OBOs5eJrY7OWdHgApKygyzO+XQk dttlhFvbpTs+kjbUVuIOVeQvqSaONQRs33F8Z+qnvIMEguwQAbsqBSUZMNSPRrkHfmpVv6iU OQTUJmToakdDMlWQoXkU9S1PrCK8E=; 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, Felix Moessbauer Subject: [PATCH v2 01/10] fix rebuild of rootfs_finalize task Date: Thu, 12 Jan 2023 05:56:10 +0000 Message-Id: <20230112055619.843445-2-felix.moessbauer@siemens.com> In-Reply-To: <20230112055619.843445-1-felix.moessbauer@siemens.com> References: <20230112055619.843445-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: 1RUc85Tr6jAD The rootfs_finalize task currently cannot be re-executed, as it moves the sources-list into bootstrap.list. As this only has to be done once, it is not required on subsequent executions. To fix the rebuild issue, we simply ignore the return code of the mv statement. Signed-off-by: Felix Moessbauer --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 629a0c1..6f0607e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -425,7 +425,7 @@ do_rootfs_finalize() { rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" mv "${ROOTFSDIR}/etc/apt/sources-list" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" || true rm -f "${ROOTFSDIR}/etc/apt/sources-list" EOSUDO -- 2.34.1