public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: venkata.pyla@toshiba-tsip.com
To: isar-users@googlegroups.com
Cc: venkata pyla <venkata.pyla@toshiba-tsip.com>,
	jan.kiszka@siemens.com, kazuhiro3.hayashi@toshiba.co.jp,
	dinesh.kumar@toshiba-tsip.com, felix.moessbauer@siemens.com
Subject: [PATCH 5/5] wic: make ext2/3/4 images reproducible
Date: Thu,  7 Dec 2023 21:11:14 +0530	[thread overview]
Message-ID: <20231207154114.20400-6-venkata.pyla@toshiba-tsip.com> (raw)
In-Reply-To: <20231207154114.20400-1-venkata.pyla@toshiba-tsip.com>

From: venkata pyla <venkata.pyla@toshiba-tsip.com>

Ext2/3/4 FS contains not only mtime, but also ctime, atime and crtime.
Currently, all the files are being added into the rootfs image using
mkfs -d functionality which affects all the timestamps excluding mtime.
This patch ensures these timestamps inside the FS image equal to
the SOURCE_DATE_EPOCH if it is set.

taken from openembedded-core: 75d2dd0ea7790db2e8ee921784ca373abff2df65

Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
---
 scripts/lib/wic/partition.py | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 44b1277e..e7641c9e 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -305,17 +305,36 @@ class Partition():
                 f.write("cd etc\n")
                 f.write("rm fstab\n")
                 f.write("write %s fstab\n" % (self.updated_fstab_path))
-                if os.getenv('SOURCE_DATE_EPOCH'):
-                    fstab_time = int(os.getenv('SOURCE_DATE_EPOCH'))
-                    for time in ["atime", "mtime", "ctime"]:
-                        f.write("set_inode_field fstab %s %s\n" % (time, hex(fstab_time)))
-                        f.write("set_inode_field fstab %s_extra 0\n" % (time))
             debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs)
             exec_native_cmd(debugfs_cmd, native_sysroot)
 
         mkfs_cmd = "fsck.%s -pvfD %s" % (self.fstype, rootfs)
         exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo)
 
+        if os.getenv('SOURCE_DATE_EPOCH'):
+            sde_time = hex(int(os.getenv('SOURCE_DATE_EPOCH')))
+            debugfs_script_path = os.path.join(cr_workdir, "debugfs_script")
+            files = []
+            for root, dirs, others in os.walk(rootfs_dir):
+                base = root.replace(rootfs_dir, "").rstrip(os.sep)
+                files += [ "/" if base == "" else base ]
+                files += [ base + "/" + n for n in dirs + others ]
+            with open(debugfs_script_path, "w") as f:
+                f.write("set_current_time %s\n" % (sde_time))
+                if self.updated_fstab_path and self.has_fstab and not self.no_fstab_update:
+                    f.write("set_inode_field /etc/fstab mtime %s\n" % (sde_time))
+                    f.write("set_inode_field /etc/fstab mtime_extra 0\n")
+                for file in set(files):
+                    for time in ["atime", "ctime", "crtime"]:
+                        f.write("set_inode_field \"%s\" %s %s\n" % (file, time, sde_time))
+                        f.write("set_inode_field \"%s\" %s_extra 0\n" % (file, time))
+                for time in ["wtime", "mkfs_time", "lastcheck"]:
+                    f.write("set_super_value %s %s\n" % (time, sde_time))
+                for time in ["mtime", "first_error_time", "last_error_time", "kbytes_written"]:
+                    f.write("set_super_value %s 0\n" % (time))
+            debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs)
+            exec_native_cmd(debugfs_cmd, native_sysroot)
+
         self.check_for_Y2038_problem(rootfs, native_sysroot)
 
     def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir,
-- 
2.20.1



  parent reply	other threads:[~2023-12-07 15:41 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <AQHaKSPYp2dXzOOhJUivzLFOKAgd4rF2a70A>
2023-12-07 15:41 ` [PATCH 0/5] Make ext4 " venkata.pyla
2023-12-07 15:41   ` [PATCH 1/5] linux-module: Use debug-prefix-map to build modules deterministically venkata.pyla
2023-12-08 10:27     ` MOESSBAUER, Felix
2023-12-07 15:41   ` [PATCH 2/5] wic: Set file system uuid to ext4 partitions venkata.pyla
2023-12-07 15:41   ` [PATCH 3/5] wic: use E2FSPROGS_FAKE_TIME and hash_seed to generate reproducible ext4 images venkata.pyla
2023-12-08 10:33     ` MOESSBAUER, Felix
2023-12-08 18:14       ` Venkata.Pyla
2023-12-09 11:07         ` Florian Bezdeka
2023-12-12 14:06           ` Venkata.Pyla
2023-12-28  6:02             ` Venkata.Pyla
2023-12-28  8:47               ` Florian Bezdeka
2023-12-28 10:10                 ` Anton Mikanovich
2024-03-13 10:01                   ` Adithya.Balakumar
2024-03-13 16:00                     ` Anton Mikanovich
2024-03-14  4:37                       ` Adithya.Balakumar
2024-04-25  6:24                       ` MOESSBAUER, Felix
2024-04-25  6:30                         ` Jan Kiszka
2024-04-25  7:02                           ` MOESSBAUER, Felix
2024-04-26  8:58                         ` Anton Mikanovich
2024-04-23  9:17     ` MOESSBAUER, Felix
2024-07-05 12:13       ` Adithya Balakumar
2024-07-08 10:43         ` 'MOESSBAUER, Felix' via isar-users
     [not found]           ` <CAM=oSXcw+sH3VYsstvDmRbLTK-H0ncFEbuqOhG2R0_P4bUYXjw@mail.gmail.com>
2024-07-08 11:12             ` Adithya.Balakumar
2023-12-07 15:41   ` [PATCH 4/5] wic: honor the SOURCE_DATE_EPOCH in case of updated fstab venkata.pyla
2023-12-07 15:41   ` venkata.pyla [this message]
2023-12-08 10:29   ` [PATCH 0/5] Make ext4 images reproducible MOESSBAUER, Felix
2023-12-08 18:12     ` Venkata.Pyla

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=20231207154114.20400-6-venkata.pyla@toshiba-tsip.com \
    --to=venkata.pyla@toshiba-tsip.com \
    --cc=dinesh.kumar@toshiba-tsip.com \
    --cc=felix.moessbauer@siemens.com \
    --cc=isar-users@googlegroups.com \
    --cc=jan.kiszka@siemens.com \
    --cc=kazuhiro3.hayashi@toshiba.co.jp \
    /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