diff options
| -rw-r--r-- | README.patches | 19 | ||||
| -rwxr-xr-x | v4l/scripts/hghead.pl | 24 | ||||
| -rwxr-xr-x | v4l/scripts/prep_commit_msg.pl | 17 |
3 files changed, 43 insertions, 17 deletions
diff --git a/README.patches b/README.patches index 6551964fd..785a67819 100644 --- a/README.patches +++ b/README.patches @@ -1,5 +1,5 @@ Mauro Carvalho Chehab <mchehab at infradead dot org> - Updated on 2008 June, 29 + Updated on 2008 August, 5 This file describes the general procedures used by the LinuxTV team (*) and by the v4l-dvb community. @@ -149,6 +149,8 @@ b) All commits at mercurial trees should have a consistent message, This "patch" does nothing. + Priority: normal + Signed-off-by: nowhere <nowhere@noplace.org> All lines starting with # and all lines starting with HG: will be @@ -160,10 +162,17 @@ b) All commits at mercurial trees should have a consistent message, From: line shouldn't be omitted, since it will be used for the patch author when converting to -git. -c) Since June, 1st, 2007, all patches are requested to have their coding style - validated by using script/checkpatch.pl. This check runs automatically by - using "make commit". By default, it will try to use the newest version of - the script, between the kernel one and a copy at v4l-dvb development tree. + Priority: meta-tag will be used as a hint to the subsystem maintainer, to help him to + identify if the patch is an improvement or board addition ("normal"), that will follow + the normal lifecycle of a patch (e.g. will be sent upstream on the next merge tree), if + the patch is a bug fix tree for a while without merging upstream ("low"). + + Valid values for "Priority:" are "low", "normal" and "high". + +c) All patches are requested to have their coding style validated by using + script/checkpatch.pl. This check runs automatically by using "make commit". By default, + it will try to use the newest version of the script, between the kernel one and a copy + at v4l-dvb development tree. It is always a good idea to use in-kernel version, since additional tests are performed (like checking for the usage of deprecated API's that are diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl index 0f086294d..7dd40380a 100755 --- a/v4l/scripts/hghead.pl +++ b/v4l/scripts/hghead.pl @@ -19,6 +19,7 @@ my $maintainer_name=$ENV{CHANGE_LOG_NAME}; my $maintainer_email=$ENV{CHANGE_LOG_EMAIL_ADDRESS}; my $from=""; my $body=""; +my $priority=""; my $signed=""; my $fromname=""; @@ -64,8 +65,8 @@ while ($line = <IN>) { my $tag=$line; my $arg=$line; - $tag =~ s/\s*([^\s]+:)(.*)\n/\1/; - $arg =~ s/\s*([^\s]+:)(.*)\n/\2/; + $tag =~ s/\s*([^\s]+:)\s*(.*)\n/\1/; + $arg =~ s/\s*([^\s]+:)\s*(.*)\n/\2/; $tag =~ tr/A-Z/a-z/; @@ -96,6 +97,19 @@ while ($line = <IN>) { next; } + if ($tag =~ m/^priority:/) { + $arg =~ tr/A-Z/a-z/; + + # Replace the -git branch names for high/normal/low + $arg =~ s/^fixes$/high/; + $arg =~ s/^fix$/high/; + $arg =~ s/^working$/normal/; + $arg =~ s/^work$/normal/; + $arg =~ s/^pending$/low/; + $priority = "Priority: $arg"; + next; + } + if ($line =~ m;^ .*\/.*\| *[0-9]*;) { next; } @@ -196,9 +210,13 @@ $from=~s/[\n\s]+$//; $subject=~s/^[\n\s]+//; $subject=~s/[\n\s]+$//; -$body=~s/^[\n\s]+//; +$body=~s/^[\n]+//; $body=~s/[\n\s]+$//; +if ($priority ne "") { + $body="$body\n\n$priority"; +} + $body="$body\n\n$signed"; $body=~s/^[\n\s]+//; diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl index ffd8aeb84..926a2094b 100755 --- a/v4l/scripts/prep_commit_msg.pl +++ b/v4l/scripts/prep_commit_msg.pl @@ -128,21 +128,20 @@ if ($diff eq 'qdiff') { } print <<"EOF"; # -# For better log display, please keep a blank line after subject, after from, -# and before signed-off-by. -# First line should be the subject, without Subject: -# +# Patch Subject (a brief description with less than 74 chars): -# Now, patch author (just the main one), on a From: field -# Please change below if the committer is not the patch author. -# +# From Line, identifying the name of the patch author From: $user -# Then a detailed description: +# A detailed description: +# NEW: Please change the priority of the patch to "high" if the patch is +# a bug fix, or are meant to be applied at the first upstream +# version of a new driver whose changes don't depend on changes on +# core modules +Priority: normal # At the end Signed-off-by: fields by patch author and committer, at least. -# Signed-off-by: $user EOF |