[kernel] r22814 - in dists/trunk/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Wed Jul  8 01:54:15 2015
New Revision: 22814

Log:
linux-manual: kernel-doc: Use $KBUILD_BUILD_TIMESTAMP as man page date

Added:
   dists/trunk/linux/debian/patches/bugfix/all/kernel-doc-set-man-page-date.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Wed Jul  8 01:01:30 2015	(r22813)
+++ dists/trunk/linux/debian/changelog	Wed Jul  8 01:54:15 2015	(r22814)
@@ -3,6 +3,7 @@
   * Fix more issues that prevent a reproducible build:
     - linux-doc: DocBook: generate consistent IDs
     - linux-doc: DocBook: Fix duplicate man pages
+    - linux-manual: kernel-doc: Use $KBUILD_BUILD_TIMESTAMP as man page date
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 07 Jul 2015 16:25:05 +0100
 

Added: dists/trunk/linux/debian/patches/bugfix/all/kernel-doc-set-man-page-date.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/kernel-doc-set-man-page-date.patch	Wed Jul  8 01:54:15 2015	(r22814)
@@ -0,0 +1,33 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 08 Jul 2015 02:37:21 +0100
+Subject: kernel-doc: Use $KBUILD_BUILD_TIMESTAMP as man page date
+Bug-Debian: https://bugs.debian.org/769844
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+--- a/scripts/kernel-doc
++++ b/scripts/kernel-doc
+@@ -253,11 +253,20 @@ my %highlights = %highlights_man;
+ my $blankline = $blankline_man;
+ my $modulename = "Kernel API";
+ my $function_only = 0;
++my $show_not_found = 0;
++
++my @build_time;
++if (defined($ENV{'KBUILD_BUILD_TIMESTAMP'}) &&
++    (my $seconds = `date -d"${ENV{'KBUILD_BUILD_TIMESTAMP'}}" +%s`) ne '') {
++    @build_time = gmtime($seconds);
++} else {
++    @build_time = localtime;
++}
++
+ my $man_date = ('January', 'February', 'March', 'April', 'May', 'June',
+ 		'July', 'August', 'September', 'October',
+-		'November', 'December')[(localtime)[4]] .
+-  " " . ((localtime)[5]+1900);
+-my $show_not_found = 0;
++		'November', 'December')[$build_time[4]] .
++  " " . ($build_time[5]+1900);
+ 
+ # Essentially these are globals.
+ # They probably want to be tidied up, made more localised or something.

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Wed Jul  8 01:01:30 2015	(r22813)
+++ dists/trunk/linux/debian/patches/series	Wed Jul  8 01:54:15 2015	(r22814)
@@ -72,6 +72,7 @@
 bugfix/all/remove-timestamps-from-compressed-man-pages.patch
 bugfix/all/docbook-generate-consistent-ids.patch
 bugfix/all/docbook-fix-duplicate-man-pages.patch
+bugfix/all/kernel-doc-set-man-page-date.patch
 
 # Miscellaneous features
 features/all/efi-autoload-efi-pstore.patch