Skip to content

Commit a979522

Browse files
mettimasahir0y
authored andcommitted
kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
To avoid unnecessary recompilations, mkcompile_h does not regenerate compile.h if just the timestamp changed. Though, if KBUILD_BUILD_TIMESTAMP is set, an explicit timestamp for the build was requested, in which case we should not ignore it. If a user follows the documentation for reproducible builds [1] and defines KBUILD_BUILD_TIMESTAMP as the git commit timestamp, a clean build will have the correct timestamp. A subsequent cherry-pick (or amend) changes the commit timestamp and if an incremental build is done with a different KBUILD_BUILD_TIMESTAMP now, that new value is not taken into consideration. But it should for reproducibility. Hence, whenever KBUILD_BUILD_TIMESTAMP is explicitly set, do not ignore UTS_VERSION when making a decision about whether the regenerated version of compile.h should be moved into place. [1] https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html Signed-off-by: Matthias Maennich <maennich@google.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 parent 4a67959 commit a979522

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

scripts/mkcompile_h

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,23 @@ UTS_VERSION="$(echo $UTS_VERSION $CONFIG_FLAGS $TIMESTAMP | cut -b -$UTS_LEN)"
6868
# Only replace the real compile.h if the new one is different,
6969
# in order to preserve the timestamp and avoid unnecessary
7070
# recompilations.
71-
# We don't consider the file changed if only the date/time changed.
71+
# We don't consider the file changed if only the date/time changed,
72+
# unless KBUILD_BUILD_TIMESTAMP was explicitly set (e.g. for
73+
# reproducible builds with that value referring to a commit timestamp).
7274
# A kernel config change will increase the generation number, thus
7375
# causing compile.h to be updated (including date/time) due to the
7476
# changed comment in the
7577
# first line.
7678

79+
if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then
80+
IGNORE_PATTERN="UTS_VERSION"
81+
else
82+
IGNORE_PATTERN="NOT_A_PATTERN_TO_BE_MATCHED"
83+
fi
84+
7785
if [ -r $TARGET ] && \
78-
grep -v 'UTS_VERSION' $TARGET > .tmpver.1 && \
79-
grep -v 'UTS_VERSION' .tmpcompile > .tmpver.2 && \
86+
grep -v $IGNORE_PATTERN $TARGET > .tmpver.1 && \
87+
grep -v $IGNORE_PATTERN .tmpcompile > .tmpver.2 && \
8088
cmp -s .tmpver.1 .tmpver.2; then
8189
rm -f .tmpcompile
8290
else

0 commit comments

Comments
 (0)