From d621fa9c09e93fe2b6136cb1cefc6683b68078b0 Mon Sep 17 00:00:00 2001 From: thuermann Date: Wed, 18 Apr 2007 14:05:21 +0000 Subject: [PATCH] Remove everything from version.h except definition of RCSID(). Rename macro VERSION to CAN_VERSION, now defined in core.h. Add macro CAN_ABI_VERSION. Don't include version.h in kernel patches and delete usage of RCSID() from all files generated by mkpatch. git-svn-id: svn://svn.berlios.de//socketcan/trunk@217 030b6a49-0b11-0410-94ab-b0dab22257f2 --- FILES-2.6 | 1 - kernel/2.6/drivers/net/can/slcan.c | 4 ++-- kernel/2.6/drivers/net/can/vcan.c | 4 ++-- kernel/2.6/include/linux/can/core.h | 6 ++++++ kernel/2.6/include/linux/can/version.h | 18 ------------------ kernel/2.6/net/can/af_can.c | 4 ++-- kernel/2.6/net/can/bcm.c | 2 +- kernel/2.6/net/can/proc.c | 4 ++-- kernel/2.6/net/can/raw.c | 4 ++-- mkpatch | 20 ++++++++++++++++++-- 10 files changed, 35 insertions(+), 32 deletions(-) diff --git a/FILES-2.6 b/FILES-2.6 index 6330839..dce9819 100644 --- a/FILES-2.6 +++ b/FILES-2.6 @@ -7,7 +7,6 @@ kernel/2.6/net/can/raw.c kernel/2.6/net/can/bcm.c kernel/2.6/include/linux/can.h kernel/2.6/include/linux/can/core.h -kernel/2.6/include/linux/can/version.h kernel/2.6/include/linux/can/error.h kernel/2.6/include/linux/can/raw.h kernel/2.6/include/linux/can/bcm.h diff --git a/kernel/2.6/drivers/net/can/slcan.c b/kernel/2.6/drivers/net/can/slcan.c index 5206aed..63b6e2d 100644 --- a/kernel/2.6/drivers/net/can/slcan.c +++ b/kernel/2.6/drivers/net/can/slcan.c @@ -81,8 +81,8 @@ RCSID("$Id$"); -static __initdata const char banner[] = KERN_INFO - "CAN: serial line CAN interface " VERSION "\n"; +static __initdata const char banner[] = + KERN_INFO "CAN: serial line CAN interface " CAN_VERSION "\n"; MODULE_ALIAS_LDISC(N_SLCAN); MODULE_DESCRIPTION("serial line CAN interface"); diff --git a/kernel/2.6/drivers/net/can/vcan.c b/kernel/2.6/drivers/net/can/vcan.c index 88ce077..f7672a2 100644 --- a/kernel/2.6/drivers/net/can/vcan.c +++ b/kernel/2.6/drivers/net/can/vcan.c @@ -54,8 +54,8 @@ RCSID("$Id$"); -static __initdata const char banner[] = KERN_INFO "CAN: virtual CAN " - "interface " VERSION "\n"; +static __initdata const char banner[] = + KERN_INFO "CAN: virtual CAN interface " CAN_VERSION "\n"; MODULE_DESCRIPTION("virtual CAN interface"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/kernel/2.6/include/linux/can/core.h b/kernel/2.6/include/linux/can/core.h index d483797..291e4e5 100644 --- a/kernel/2.6/include/linux/can/core.h +++ b/kernel/2.6/include/linux/can/core.h @@ -21,6 +21,12 @@ #include #include + +#define CAN_VERSION "2.0.0-pre6" + +/* increment this number each time you change some user-space interface */ +#define CAN_ABI_VERSION 8 + #define DNAME(dev) ((dev) ? (dev)->name : "any") #define CAN_PROC_DIR "net/can" /* /proc/... */ diff --git a/kernel/2.6/include/linux/can/version.h b/kernel/2.6/include/linux/can/version.h index 30c1c5a..6a62680 100644 --- a/kernel/2.6/include/linux/can/version.h +++ b/kernel/2.6/include/linux/can/version.h @@ -19,22 +19,4 @@ RCSID("$Id$"); -#define MAJORVERSION 2 -#define MINORVERSION 0 -#define PATCHLEVEL 0 -#define EXTRAVERSION "-pre6" - -#define LLCF_VERSION_CODE (((MAJORVERSION) << 16) + ((MINORVERSION) << 8) \ - + (PATCHLEVEL)) - -/* stringification: these are the usual macros to stringify with macro - expansion. The str() macro does the expansion, the xstr() macro is - for the actual stringification. -*/ -#define str(arg) xstr(arg) -#define xstr(arg) #arg - -#define VERSION str(MAJORVERSION) "." str(MINORVERSION) "." str(PATCHLEVEL) \ - EXTRAVERSION - #endif /* CAN_VERSION_H */ diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c index 86cd673..8de4c9f 100644 --- a/kernel/2.6/net/can/af_can.c +++ b/kernel/2.6/net/can/af_can.c @@ -71,8 +71,8 @@ RCSID("$Id$"); #define IDENT "af_can" -static __initdata const char banner[] = KERN_INFO "CAN: Controller Area " - "Network PF_CAN core " VERSION "\n"; +static __initdata const char banner[] = + KERN_INFO "CAN: Controller Area Network PF_CAN core " CAN_VERSION "\n"; MODULE_DESCRIPTION("Controller Area Network PF_CAN core"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c index d9a4563..2ace273 100644 --- a/kernel/2.6/net/can/bcm.c +++ b/kernel/2.6/net/can/bcm.c @@ -83,7 +83,7 @@ module_param(debug, int, S_IRUGO); #define IDENT "bcm" static __initdata const char banner[] = KERN_INFO - "CAN: broadcast manager (bcm) socket protocol " VERSION "\n"; + "CAN: broadcast manager (bcm) socket protocol " CAN_VERSION "\n"; MODULE_DESCRIPTION("PF_CAN bcm sockets"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/kernel/2.6/net/can/proc.c b/kernel/2.6/net/can/proc.c index b4c004a..c05cf09 100644 --- a/kernel/2.6/net/can/proc.c +++ b/kernel/2.6/net/can/proc.c @@ -340,8 +340,8 @@ static int can_proc_read_version(char *page, char **start, off_t off, int len = 0; len += snprintf(page + len, PAGE_SIZE - len, - "%06X [ Volkswagen Group - Low Level CAN Framework" - " (LLCF) v%s ]\n", LLCF_VERSION_CODE, VERSION); + "CAN version %s, ABI version %d", + CAN_VERSION, CAN_ABI_VERSION); *eof = 1; return len; } diff --git a/kernel/2.6/net/can/raw.c b/kernel/2.6/net/can/raw.c index dcc78a8..43c8618 100644 --- a/kernel/2.6/net/can/raw.c +++ b/kernel/2.6/net/can/raw.c @@ -61,8 +61,8 @@ RCSID("$Id$"); #define IDENT "raw" -static __initdata const char banner[] = KERN_INFO "CAN: raw socket protocol" - " " VERSION "\n"; +static __initdata const char banner[] = + KERN_INFO "CAN: raw socket protocol " CAN_VERSION "\n"; MODULE_DESCRIPTION("PF_CAN raw sockets"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/mkpatch b/mkpatch index 26062cd..d7dc774 100755 --- a/mkpatch +++ b/mkpatch @@ -5,6 +5,8 @@ # Generate a kernel patch to add socketcan to a kernel src tree. # The list of files to be added is read from stdin. +use POSIX qw(strftime); + $version = shift; if (-r "patches/$version.diff") { @@ -43,15 +45,29 @@ sub add_file { open file, "./kv $version $file |" || die "open $file\n"; @lines = ; $count = $#lines + 1; - use POSIX qw(strftime); $mtime = (stat($file))[9]; $ts = strftime "%F %T", gmtime((stat($file))[9]); + for $i (0..$#lines) { + if ($lines[$i] =~ /include.*linux\/can\/version\.h/) { + undef($lines[$i]); + $count--; + } + if ($lines[$i] =~ /RCSID/) { + undef($lines[$i]); + $count--; + while ($lines[++$i] eq "\n") { + undef($lines[$i]); + $count--; + } + } + } + print "--- a/$name 1970-01-01 00:00:00\n"; print "+++ b/$name $ts\n"; print "@@ -0,0 +1,$count @@\n"; for (@lines) { - print "+$_"; + print "+$_" if (defined($_)); } close file; } -- 2.39.2