diff options
| -rw-r--r-- | README.CVS | 23 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 | ||||
| -rw-r--r-- | v4l/scripts/gentree.pl | 12 |
3 files changed, 37 insertions, 8 deletions
diff --git a/README.CVS b/README.CVS index abfbc7750..b0c531b2e 100644 --- a/README.CVS +++ b/README.CVS @@ -1,4 +1,4 @@ -Mauro Carvalho Chehab 2005 Dec 02 +Mauro Carvalho Chehab 2005 Dec 08 CVS is a developer database, It means that it might be broken from time to time. There are more "stable" snapshots at @@ -73,7 +73,7 @@ export CHANGE_LOG_NAME CHANGE_LOG_EMAIL_ADDRESS CHANGE_LOG_LOGIN Obs.: Timestamp should be in GMT. - 9) Commit messages are very rellevant, since they will be used + 10) Commit messages are very rellevant, since they will be used when generating the patches for mainstream. The format of commit message shall be: Subject: patch subject @@ -89,14 +89,14 @@ Signed-off-by: Cvs Maintainer <cvsmaintainer@cvsmaintainersite.com> You may add other signers, if the patch were tested by somebody else and he also wants to sign. - 10) if the patch also affects other parts of kernel (like alsa + 11) if the patch also affects other parts of kernel (like alsa or i2c), it is required that, at upstream submiting, the patch also go to the maintainers of that piece. To do this, CVS maintainer shall add one or more cc: fields at commit cvs message: CC: someotherkerneldeveloper@someplace - 11) Sometimes, mainstream changes do affect CVS tree, and + 12) Sometimes, mainstream changes do affect CVS tree, and requires to apply some kernel patches at the tree. This kind of commit should follow the rules above and should also have a line like: @@ -104,5 +104,20 @@ kernel-sync Patches with such lines will not be submited upstream. + 13) sometimes, it is necessary to introduce some testing code +or remove parts that are not yet finished. Also, compatibility tests +maybe required. + To allow compatibility tests, "compat.h" should be included +first. It does include also linux/version.h. + To include testing code, #if 0 or #if 1 may be used. +If this code is meant to go also to kernel, this struct shuld be used: +#if 0 /* keep */ + or +#if 1 /* keep */ + + 14) Nested #ifs are allowed, but #elsif macro shouldn't be used, +since the macro preprocessing script used to prepare kernel upstream +patches (v4l/scripts/gentree.pl) is not able to handle it. + Mauro Mauro Carvalho Chehab <mchehab .at. linuxtv .dot. org> diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ba672c6b3..e4f695633 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-12-08 14:05 mchehab + + * README.CVS: + - Updated to explain usage of #if macros + + * v4l/scripts/gentree.pl: + - gentree was removing linux/version.h from .c files. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-08 13:47 mchehab * linux/drivers/media/dvb/b2c2/flexcop-eeprom.c: diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index 7c044ee06..74db9f1ad 100644 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -67,10 +67,6 @@ sub filter_source ($$) { print STDERR "File: $in, for kernel $VERSION($CODE)/\n" if $DEBUG; while ($line = <IN>) { - if ($line =~ m/^#include <linux\/version.h>/ && - $in =~ m/.*\.c/) { - next; - } if ($line =~ m/^#include \"compat.h\"/) { next; } @@ -93,6 +89,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#if 0\s.*[Kk][Ee][Ee][Pp].*/) { + chomp($line); + $state{$level} = "ifother"; + $if{$level} = 0; + print STDERR "/* BP #if 0 (keep) state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#if 1\s.*[Kk][Ee][Ee][Pp].*/) { print OUT "#if 1\n"; $state{$level} = "ifother"; |