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/6.1.140-1+rpi1^2~140
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=995e2052d8197cfc7f916c7d29e5e67458facf06;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/init/Makefile b/init/Makefile
index 8316c23bead..e99b8de4a93 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC)	:= PREEMPT_DYNAMIC
 preempt-flag-$(CONFIG_PREEMPT_RT)	:= PREEMPT_RT
 
 build-version = $(or $(KBUILD_BUILD_VERSION), $(build-version-auto))
-build-timestamp = $(or $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto))
+build-timestamp = $(or $(KBUILD_BUILD_VERSION_TIMESTAMP), $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto))
 
 # Maximum length of UTS_VERSION is 64 chars
 filechk_uts_version = \