From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7185478367340134400 X-Received: by 2002:adf:eb85:0:b0:27a:4d49:ba6d with SMTP id t5-20020adfeb85000000b0027a4d49ba6dmr1200942wrn.151.1672999553010; Fri, 06 Jan 2023 02:05:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3ca5:b0:3cf:72dc:df8 with SMTP id bg37-20020a05600c3ca500b003cf72dc0df8ls945947wmb.0.-pod-canary-gmail; Fri, 06 Jan 2023 02:05:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXvqI94mxtp8OuclYjXTQGTRSnABhZwA8UcCQYgFiFpRRm9Bj2AX9jMxSz3OdJMLHxHS0a1x X-Received: by 2002:a05:600c:4e51:b0:3d1:e1f4:21d1 with SMTP id e17-20020a05600c4e5100b003d1e1f421d1mr48158894wmq.26.1672999548006; Fri, 06 Jan 2023 02:05:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672999547; cv=none; d=google.com; s=arc-20160816; b=0uf7n6+5fFcHHcrtel3dA9/0n//HaZD4tuq47KOybfVjl2z/oxOMYQYvFzWyElSEAD zHDBYKgUnAMT+UD+4+Z0mC+y1iWZPkZsAGyBAMCrckfJE2OTDKLWbKqKTU3AQl4NoDh0 tsCqV2hG+KH2eMgEWKxZ7IyiWnobQ2qz9QoSVdhYS3rEWpn71Jub7d1A7l80A182TrzH w75mezCd6YirurXXMm1Sy3R6G/ARRvaVTYnx83zC82aONu2sNR9Euu0YWo3DQ5lxqGUQ KaNe2EWxBkhVvZ90fDio/CtLSo/vmgbIx70gX22jaQshid8oLxkCPHV4XfzUXEb9tgyH ECTw== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=eil/bvohUejPmWynH7UnejU9DotN9ZkyRKIIXv8yAkE=; b=AfMTpq9VXTPIdhP4p+U2ZIpY+JLzw2XNDrhLhNG8+ziJBN74mXuILEI431x3Oi0yYs vi3ViE8/is+n9UV8f4HwIf1bSZa5IQ4Z4ig20oBb+zlgtellAwAUtyYcui0kb2i6jTyX f502F1GmzaBhFsK7VbuevsWhs1FV6ZkN71VoycDsC1AKe6+22uz/SsEEfeRjekPdYZ/W p8htqHHyHVz6CVhTU7f2PI5dGTbmz6pQCYOKveKjdDnjLyb9xeTJlIBbvHBPeoRZX1MT sUqJNLXSn9dpSoHR2E9Rd4v0PkzcG53yuVsarddsCW/qLPS9b3uPHUeuaX6LHDtVgLzx uB/g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PQQH7fc+; spf=pass (google.com: domain of fm-72506-202301061005473695d0b15a6311d26e-4sdjsf@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202301061005473695d0b15a6311d26e-4Sdjsf@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 ay6-20020a05600c1e0600b003d9c716fa3csi320010wmb.1.2023.01.06.02.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2023 02:05:47 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202301061005473695d0b15a6311d26e-4sdjsf@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=PQQH7fc+; spf=pass (google.com: domain of fm-72506-202301061005473695d0b15a6311d26e-4sdjsf@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202301061005473695d0b15a6311d26e-4Sdjsf@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 202301061005473695d0b15a6311d26e for ; Fri, 06 Jan 2023 11:05:47 +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; bh=eil/bvohUejPmWynH7UnejU9DotN9ZkyRKIIXv8yAkE=; b=PQQH7fc++aV24WPnfp8IOS/6V/2tMrhS71KIhJPCXzYn1wg2vtHRVkB2jONDq+Fxtvu0K6 hz41SkBpc/o/EdKQhcq/ulw+8bu8oGMl+pCB0PB0hDn2HHgym9fI+szJTXMsjWmq2/gGunVO gc1L9Shh94/FRhB4xwlYynfI/KZXE=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: venkata.pyla@toshiba-tsip.com, amikan@ilbers.de, jan.kiszka@siemens.com, kazuhiro3.hayashi@toshiba.co.jp, dinesh.kumar@toshiba-tsip.com, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH] fix rebuild of rootfs_finalize task Date: Fri, 6 Jan 2023 10:05:25 +0000 Message-Id: <20230106100525.765479-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: /84lzeXC55G0 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