Make mkcompile_h accept an alternate timestamp string

Forwarded: not-needed

We want to include the Debian version in the utsname::version string
instead of a full timestamp string.  However, we still need to provide
a standard timestamp string for gen_initramfs_list.sh to make the
kernel image reproducible.

Make mkcompile_h use $KBUILD_BUILD_VERSION_TIMESTAMP in preference to
$KBUILD_BUILD_TIMESTAMP.

Gbp-Pq: Topic debian
Gbp-Pq: Name uname-version-timestamp.patch

diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 4ae735039daf2c554dcc2f6c46879a76fc08f851..5a1abe7b4169f7eef8deecdf74398ffa3e1967ae 100755 (executable)
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -24,10 +24,14 @@ else
        VERSION=$KBUILD_BUILD_VERSION
 fi
 
-if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then
-       TIMESTAMP=`date`
+if [ -z "$KBUILD_BUILD_VERSION_TIMESTAMP" ]; then
+       if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then
+               TIMESTAMP=`date`
+       else
+               TIMESTAMP=$KBUILD_BUILD_TIMESTAMP
+       fi
 else
-       TIMESTAMP=$KBUILD_BUILD_TIMESTAMP
+       TIMESTAMP=$KBUILD_BUILD_VERSION_TIMESTAMP
 fi
 if test -z "$KBUILD_BUILD_USER"; then
        LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/')