Re: [Reproducible-builds] [PATCH 1/2] Documentation: Avoid creating man pages in source tree

2015-09-12 Thread Jonathan Corbet
On Tue, 01 Sep 2015 23:48:49 +0100
Ben Hutchings  wrote:

> Currently kernel-doc generates a dummy DocBook file when asked to
> convert a C source file with no structured comments.  For an
> out-of-tree build (objtree != srctree), the title of the output file
> is the absolute path name of the C source file, which later results
> in a manual page being created alongside the C source file.
> 
> Change the title to be a relative path.

Applied to the docs tree, thanks.

jon

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds


[Reproducible-builds] [PATCH 1/2] Documentation: Avoid creating man pages in source tree

2015-09-01 Thread Ben Hutchings
Currently kernel-doc generates a dummy DocBook file when asked to
convert a C source file with no structured comments.  For an
out-of-tree build (objtree != srctree), the title of the output file
is the absolute path name of the C source file, which later results
in a manual page being created alongside the C source file.

Change the title to be a relative path.

Signed-off-by: Ben Hutchings 
---
 scripts/kernel-doc | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 0ac1a07..e5a753f 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2351,12 +2351,13 @@ sub process_file($) {
 my $descr;
 my $in_purpose = 0;
 my $initial_section_counter = $section_counter;
+my ($orig_file) = @_;
 
 if (defined($ENV{'SRCTREE'})) {
-   $file = "$ENV{'SRCTREE'}" . "/" . "@_";
+   $file = "$ENV{'SRCTREE'}" . "/" . $orig_file;
 }
 else {
-   $file = "@_";
+   $file = $orig_file;
 }
 if (defined($source_map{$file})) {
$file = $source_map{$file};
@@ -2565,7 +2566,7 @@ sub process_file($) {
print "\n";
print " \n";
print "  \n";
-   print "   ${file}\n";
+   print "   ${orig_file}\n";
print "  \n";
print "  \n";
print "   Document generation inconsistency\n";
@@ -2579,7 +2580,7 @@ sub process_file($) {
print "   \n";
print "The template for this document tried to insert\n";
print "the structured comment from the file\n";
-   print "${file} at this point,\n";
+   print "${orig_file} at this point,\n";
print "but none was found.\n";
print "This dummy section is inserted to allow\n";
print "generation to continue.\n";

-- 
Ben Hutchings
The first rule of tautology club is the first rule of tautology club.



signature.asc
Description: This is a digitally signed message part
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds