diff --git a/debian/changelog b/debian/changelog index b9b5e3fa0..bb24e3d62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ linux (4.1.1-1~exp2) UNRELEASED; urgency=medium * 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 Tue, 07 Jul 2015 16:25:05 +0100 diff --git a/debian/patches/bugfix/all/kernel-doc-set-man-page-date.patch b/debian/patches/bugfix/all/kernel-doc-set-man-page-date.patch new file mode 100644 index 000000000..447ba907a --- /dev/null +++ b/debian/patches/bugfix/all/kernel-doc-set-man-page-date.patch @@ -0,0 +1,33 @@ +From: Ben Hutchings +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 +--- +--- 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. diff --git a/debian/patches/series b/debian/patches/series index 9ee2bbf42..8e1167d9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -72,6 +72,7 @@ bugfix/all/make-highlights-deterministic-in-kernel-doc.patch 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