From: Felix Moessbauer <felix.moessbauer@siemens.com>
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 <felix.moessbauer@siemens.com>
Subject: [PATCH v2 01/10] fix rebuild of rootfs_finalize task
Date: Thu, 12 Jan 2023 05:56:10 +0000 [thread overview]
Message-ID: <20230112055619.843445-2-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20230112055619.843445-1-felix.moessbauer@siemens.com>
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 <felix.moessbauer@siemens.com>
---
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
next prev parent reply other threads:[~2023-01-12 5:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 5:56 [PATCH v2 00/10] Make rootfs build reproducible Felix Moessbauer
2023-01-12 5:56 ` Felix Moessbauer [this message]
2023-01-14 20:47 ` [PATCH v2 01/10] fix rebuild of rootfs_finalize task Uladzimir Bely
2023-01-14 22:16 ` Roberto A. Foglietta
2023-01-14 23:35 ` Roberto A. Foglietta
2023-01-15 13:31 ` Moessbauer, Felix
2023-01-23 9:00 ` Henning Schild
2023-01-12 5:56 ` [PATCH v2 02/10] image.bbclass: fix non-reproducible file time-stamps inside rootfs Felix Moessbauer
2023-01-14 20:26 ` Uladzimir Bely
2023-01-14 20:31 ` Roberto A. Foglietta
2023-01-14 20:39 ` Uladzimir Bely
2023-01-15 13:42 ` Moessbauer, Felix
2023-01-15 21:57 ` Roberto A. Foglietta
2023-01-12 5:56 ` [PATCH v2 03/10] rootfs postprocess: clean python cache Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 04/10] remove non-portable ldconfig aux-cache Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 05/10] generate deterministic clear-text password hash Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 06/10] update debian initramfs in deterministic mode Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 07/10] create custom " Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 08/10] make deb_add_changelog idempotent Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 09/10] deb_add_changelog: set timestamp to valid epoch Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 10/10] make custom linux-image bit-by-bit reproducible Felix Moessbauer
2023-01-12 9:35 ` [PATCH v2 00/10] Make rootfs build reproducible Henning Schild
[not found] ` <CAJGKYO6i0hUBs4XeBtzLKnVVS6sRdVuEG9v87+wHPvXpiHzMWA@mail.gmail.com>
2023-01-13 2:29 ` Moessbauer, Felix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230112055619.843445-2-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=daniel.bovensiepen@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
--cc=venkata.pyla@toshiba-tsip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox