Remove all references to svnversion, MadWifi svn is gone

git revisions are of little use.
This commit is contained in:
Pavel Roskin 2013-11-08 11:06:54 -05:00
parent 8b13bec8b1
commit 0196108e9c
4 changed files with 4 additions and 30 deletions

View File

@ -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:

View File

@ -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"

View File

@ -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

View File

@ -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