Remove all references to svnversion, MadWifi svn is gone

git revisions are of little use.

diff --git a/Makefile b/Makefile
index deb8ddc260c5ee64152bdac5a762b27e31465f65..371d9312b7eae3b60673cd7e80e1ee211ce9a65b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ endif
 all: modules tools
 
 .PHONY: modules
-modules: configcheck $(TOP)/svnversion.h
+modules: configcheck
 ifdef LINUX24
        for i in $(obj-y); do \
                $(MAKE) -C $$i || exit 1; \
@@ -64,24 +64,6 @@ else
        $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
 endif
 
-$(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h
-
-$(TOP)/svnversion.h:
-       @cd $(TOP) && \
-       if [ -d .svn ]; then \
-               ver=$$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \
-               echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
-       elif [ -d .git ]; then \
-               ver=$$(git svn log --oneline --limit 1 | cut -d\  -f1); \
-               echo "#define SVNVERSION \"svn $$ver\"" > $@.tmp; \
-       elif [ -s SNAPSHOT ]; then \
-               ver=$$(sed -e '/^Revision: */!d;s///;q' SNAPSHOT); \
-               echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
-       else \
-               touch $@.tmp; \
-       fi || exit 1; \
-       diff $@ $@.tmp >/dev/null 2>&1 || cp -f $@.tmp $@; rm -f $@.tmp
-
 # conflicts with the 'tools' subdirectory
 .PHONY: tools
 tools:
@@ -133,7 +115,7 @@ clean:
        done
        -$(MAKE) -C $(TOOLS) clean
        rm -rf .tmp_versions
-       rm -f modules.order *.symvers Module.markers svnversion.h
+       rm -f modules.order *.symvers Module.markers
 
 .PHONY: info
 info:

diff --git a/patch-kernel/install.sh b/patch-kernel/install.sh
index bf04d27ec43ed3b6552ee2a5d176b2af9b278113..b5cf64fe8aa3dfc9535cb4d0d969c98ac5f4f207 100755 (executable)
--- a/patch-kernel/install.sh
+++ b/patch-kernel/install.sh
@@ -69,8 +69,7 @@ echo "Copying top-level files"
 MADWIFI=${WIRELESS}/madwifi
 rm -rf ${MADWIFI}
 mkdir -p ${MADWIFI}
-make -s -C ${SRC} svnversion.h
-cp -f ${SRC}/BuildCaps.inc ${SRC}/svnversion.h ${SRC}/release.h ${MADWIFI}
+cp -f ${SRC}/BuildCaps.inc ${SRC}/release.h ${MADWIFI}
 
 
 echo "Copying source files"

diff --git a/release.h b/release.h
index a6a259da1eefb1a5f7e49e376a1303f3c26bf156..5d376d82b82cd8fa7f93f6e35843ef54006f97ad 100644 (file)
--- a/release.h
+++ b/release.h
@@ -35,12 +35,5 @@
  *
  * $Id$
  */
-#include "svnversion.h"
-
 #define        RELEASE_TYPE    "BETA"
-
-#ifdef SVNVERSION
-#define RELEASE_VERSION        SVNVERSION " (trunk)"
-#else
 #define RELEASE_VERSION        "trunk"
-#endif

diff --git a/scripts/make-release.bash b/scripts/make-release.bash
index 5ce8805e5519b7838c7c200570f95bc40a88eb9d..a953357022c3678ef35550680ee9e2e8a0235b55 100755 (executable)
--- a/scripts/make-release.bash
+++ b/scripts/make-release.bash
@@ -240,7 +240,7 @@ echo; echo
 echo "temporarily adjusting release.h..."
 
 mv release.h release.h.old
-sed -e "/svnversion.h/d" \
+sed \
        -e "/RELEASE_TYPE/ s/\".*\"/\"RELEASE\"/" \
        -e "/RELEASE_VERSION/ s/\".*\"/\"$newrelease\"/" release.h.old > release.h
 rm -f release.h.old