From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187242631035879424 X-Received: by 2002:a5d:5612:0:b0:284:232a:6c6f with SMTP id l18-20020a5d5612000000b00284232a6c6fmr1999674wrv.216.1673410329926; Tue, 10 Jan 2023 20:12:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cbd8:0:b0:3cf:afd2:ab84 with SMTP id n24-20020a7bcbd8000000b003cfafd2ab84ls355917wmi.2.-pod-control-gmail; Tue, 10 Jan 2023 20:12:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXtT8eMchcRQ5XM7E4evxg27YY2zk18Al8VQtN3D5SeQ7Ade0TBWrsTC2DsSTeyP/NZ80Q2V X-Received: by 2002:a05:600c:1e09:b0:3cf:b73f:bf8f with SMTP id ay9-20020a05600c1e0900b003cfb73fbf8fmr50181215wmb.7.1673410328431; Tue, 10 Jan 2023 20:12:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673410328; cv=none; d=google.com; s=arc-20160816; b=gr932haOBNhfXYJODaOAvOpnxEDxla9EPmqEuq2pHJ+N+Vv4wjKPtxtuxCHZ8OgnmV 9m5xnfpM4RprhkysmUSkeS4WB4f2hIZ3b+CN3ttSmpofZRUqmfoPWZHuKjQSX3QT8Rkq wXkWB2WXANYov8E7E9CXInLesOI/i2l0BQQ3DBp4cUDNmfy5k4qrSxYCJcnNs9TSHQm2 SmASXNdsh3QSTUrKBbvCpt5XvFTjIUhqXYdiyxxm2VUFgtigEtqxP49bnVrTSZWnI7Fn vhZwEoNueks7BuRkLPsl5v2e2yU9AisCONAMTciROVgm5j9EhJJxzTZh1vEHgCz4u9ol syrA== 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=0tUb3tANoSxfSH9ENOptLbC9XvSqojTkq+jNDNJaRrhboDv6I9rBUlsPNhNxl/8gKA WrMNZrSd5y4f2TlRLXcgr6Kvb6lnQgkMH/5vRv34yFDqO7d/HWdyQk64/RpdySJ8O+on R3NEYWE4CBZZJS8N4vBPkJMo7I5DnFM64cIKsvxE4yatGVhflTZGJjvP4TP8AQtU//B7 lWc19YhuZ5rMK92sKECxZkUDZvoWDDZKb/T4sKLUxmSijU+lDMaFgD12CysgNpI3tR4V cxhPrpJqCB/JLGyZYWMioLqC9bSjY5SfCKKmVl75BsovclHNiAGUMpdpt3vMmxMKvK+/ iyOw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=kFsbhyNo; spf=pass (google.com: domain of fm-72506-20230111041208bc9ad585750e1b1e68-dcbrwu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230111041208bc9ad585750e1b1e68-dCBrWU@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 v6-20020a1cf706000000b003d9ae6cfd2esi611101wmh.2.2023.01.10.20.12.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2023 20:12:08 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230111041208bc9ad585750e1b1e68-dcbrwu@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=kFsbhyNo; spf=pass (google.com: domain of fm-72506-20230111041208bc9ad585750e1b1e68-dcbrwu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230111041208bc9ad585750e1b1e68-dCBrWU@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 20230111041208bc9ad585750e1b1e68 for ; Wed, 11 Jan 2023 05:12: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=eil/bvohUejPmWynH7UnejU9DotN9ZkyRKIIXv8yAkE=; b=kFsbhyNoVRWtqeXamUE6bgMx5jmBWTiPQneBqle0W8KrU0OtBzy5r41VO4IEDjUGmBLj7P Lb8do6br1Q7VE6nPFWPklOiQDgsQUhTIl0i0TbREuUw6j1Nadtfl/Os91VjcDBOs2aRoqBpw 8sux7k5fITy0GBGibxsJhk6yBBvFM=; 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 01/11] fix rebuild of rootfs_finalize task Date: Wed, 11 Jan 2023 04:11:30 +0000 Message-Id: <20230111041140.3460393-2-felix.moessbauer@siemens.com> In-Reply-To: <20230111041140.3460393-1-felix.moessbauer@siemens.com> References: <20230111041140.3460393-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: Bk59Ib1zr2Oq 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