From: Pavel Roskin <proski@gnu.org>
Date: Fri, 8 Nov 2013 16:06:54 +0000 (-0500)
Subject: Remove all references to svnversion, MadWifi svn is gone
X-Git-Url: http://git.ozo.com/?p=madwifi%2F.git;a=commitdiff_plain;h=0196108e9c2cf2bd44a8543ddedb280c6a03a50f

Remove all references to svnversion, MadWifi svn is gone

git revisions are of little use.
---

diff --git a/Makefile b/Makefile
index deb8ddc..371d931 100644
--- 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 bf04d27..b5cf64f 100755
--- 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 a6a259d..5d376d8 100644
--- 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 5ce8805..a953357 100755
--- 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