From 8bb2c675b017eec023b27c0cf6e61fee7a46bb86 Mon Sep 17 00:00:00 2001 From: "cedric.hombourger@siemens.com" Date: Tue, 2 Dec 2025 10:15:53 +0100 Subject: [PATCH] lib/oe/patch: use author date as commit date for "git am" By default, "git am" uses the time of commit creation as the committer date and is therefore "unique" to each build. Use the --committer-date-is-author-date option for git to use the author date as the committer date to get deterministic meta-data and therefore commit hashes (which may end-up in sources or build in the form of e.g. localversion file). Cc: isar-users@googlegroups.com Signed-off-by: Cedric Hombourger Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/lib/oe/patch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 77b166cfa3..246fc6221f 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -626,7 +626,8 @@ class GitApplyTree(PatchTree): try: shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) - shellcmd += ["am", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']] + shellcmd += ["am", "--committer-date-is-author-date", + "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']] return _applypatchhelper(shellcmd, patch, force, reverse, run) except CmdError: # Need to abort the git am, or we'll still be within it at the end -- 2.47.3