From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 12 May 2015 18:29:22 +0000 (+0100)
Subject: Make mkcompile_h accept an alternate timestamp string
X-Git-Tag: archive/raspbian/5.10.103-1+rpi1^2~96
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b082a2e096ab2f0f2ec36ac6fecb423b11c0bc3;p=linux.git

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 a72b154de7b..4dd11108646 100755
--- 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/\\/\\\\/')