enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patching: fix #9028 timestamp when multiple patches touch same file (#9489)

Browse Source 
If patch B sorts after patch A but has an older mtime, it would
overwrite A's timestamp on the shared file, causing the kernel Makefile
to skip recompilation.

Fix: only call os.utime() when the new mtime is strictly greater than
the file's current mtime.
This commit is contained in:
Igor Velkov 2026-03-05 11:13:40 +02:00 committed by GitHub
parent b7af31d65b
commit ae6735f470
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tools/common/patching_utils.py
View File

@ -760,10 +760,13 @@ class PatchInPatchFile:
files_to_touch = [f for f in files_to_touch if f not in self.deleted_file_names]
for file_name in files_to_touch:
# log.debug(f"Setting mtime of '{file_name}' to '{final_mtime}'.")
file_path = os.path.join(working_dir, file_name)
try:
os.utime(file_path, (final_mtime, final_mtime))
# Only bump mtime; never lower it. Multiple patches may touch the same file,
# and a later patch with an older timestamp must not override the timestamp
# set by an earlier patch with a newer one (#9028).
if final_mtime > os.path.getmtime(file_path):
os.utime(file_path, (final_mtime, final_mtime))
except FileNotFoundError:
log.warning(f"File '{file_path}' not found in patch {self}, can't set mtime.")