[B.A.T.M.A.N.] [PATCH 1/2] batctl: Remove obsolete creation of source packages

[B.A.T.M.A.N.] [PATCH 1/2] batctl: Remove obsolete creation of source packages

[Sven Eckelmann]

The creation of source packages is now either done by the release team
using special scripts or through gitweb. It is not needed to provide the
source target inside the Makefile and may not work in the future anyway.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 Makefile |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index a992e89..b5b4e2b 100644
--- a/Makefile
+++ b/Makefile
@@ -69,11 +69,8 @@ REVISION= $(shell	if [ -d .svn ]; then \
 
 REVISION_VERSION =\"\ $(REVISION)\"
 
-BAT_VERSION = $(shell grep "^\#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}')
-FILE_NAME = $(PACKAGE_NAME)_$(BAT_VERSION)-rv$(REVISION)_$@
 NUM_CPUS = $(shell nproc 2> /dev/null || echo 1)
 
-
 all:
 	$(MAKE) -j $(NUM_CPUS) $(BINARY_NAME)
 
@@ -84,25 +81,9 @@ $(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile
 	$(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@
 -include $(SRC_C:.c=.d)
 
-sources:
-	mkdir -p $(FILE_NAME)
-
-	for i in $$( find . | grep $(SRC_FILES) | grep -v "\.svn" ); do [ -d $$i ] && mkdir -p $(FILE_NAME)/$$i ; [ -f $$i ] && cp -Lvp $$i $(FILE_NAME)/$$i ;done
-
-	wget -O changelog.html  http://www.open-mesh.net/log/$(LOG_BRANCH)/
-	html2text -o changelog.txt -nobs -ascii changelog.html
-	awk '/View revision/,/10\/01\/06 20:23:03/' changelog.txt > $(FILE_NAME)/CHANGELOG
-
-	for i in $$( find man |	grep -v "\.svn" ); do [ -f $$i ] && groff -man -Thtml $$i > $(FILE_NAME)/$$i.html ;done
-
-	tar czvf $(FILE_NAME).tgz $(FILE_NAME)
-
 clean:
 	rm -f $(BINARY_NAME) *.o *.d
 
-clean-long:
-	rm -rf $(PACKAGE_NAME)_*
-
 install:
 	mkdir -p $(SBINDIR)
 	install -m 0755 $(BINARY_NAME) $(SBINDIR)
-- 
1.7.4.1

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove subversion/svk revision information

[Sven Eckelmann]

The current version of batman-adv cannot be obtained from subversion or
svk anymore. It is unnecessary to provide the functionality to retrieve
the current revision using these tools.

We only have to differenciate between git checkout and official release.
We cannot detect a git snapshot and thus the distribution has to provide
the REVISION variable for snapshots.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 Makefile |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 830c53b..84828ea 100644
--- a/Makefile
+++ b/Makefile
@@ -29,24 +29,8 @@ endif
 
 export KERNELPATH
 
-REVISION= $(shell	if [ -d .svn ]; then \
-				if which svn > /dev/null; then \
-					echo rv$$(svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'); \
-				else \
-					echo "[unknown]"; \
-				fi; \
-			elif [ -d .git ]; then \
-				if which git > /dev/null; then \
-					echo $$(git describe --always --dirty 2> /dev/null); \
-				else \
-					echo "[unknown]"; \
-				fi; \
-			elif [ -d ~/.svk ]; then \
-				if which svk > /dev/null; then \
-					echo rv$$(svk info | grep "Mirrored From" | awk '{print $$5}'); \
-				else \
-					echo "[unknown]"; \
-				fi; \
+REVISION= $(shell	if [ -d .git ]; then \
+				echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \
 			fi)
 
 NUM_CPUS = $(shell nproc 2> /dev/null || echo 1)
-- 
1.7.4.1

[B.A.T.M.A.N.] [PATCH 2/2] batctl: Remove subversion/svk revision information

[Sven Eckelmann]

The current version of batctl cannot be obtained from subversion or svk
anymore. It is unnecessary to provide the functionality to retrieve the
current revision using these tools.

We only have to differenciate between git checkout and official release.
We cannot detect a git snapshot and thus the distribution has to provide
the REVISION variable for snapshots.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 Makefile |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index b5b4e2b..217a00a 100644
--- a/Makefile
+++ b/Makefile
@@ -47,24 +47,8 @@ PACKAGE_NAME = batctl
 BINARY_NAME = batctl
 SOURCE_VERSION_HEADER = main.h
 
-REVISION= $(shell	if [ -d .svn ]; then \
-				if which svn > /dev/null; then \
-					echo rv$$(svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'); \
-				else \
-					echo "[unknown]"; \
-				fi; \
-			elif [ -d .git ]; then \
-				if which git > /dev/null; then \
-					echo $$(git describe --always --dirty 2> /dev/null); \
-				else \
-					echo "[unknown]"; \
-				fi; \
-			elif [ -d ~/.svk ]; then \
-				if which svk > /dev/null; then \
-					echo rv$$(svk info | grep "Mirrored From" | awk '{print $$5}'); \
-				else \
-					echo "[unknown]"; \
-				fi; \
+REVISION= $(shell	if [ -d .git ]; then \
+				echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \
 			fi)
 
 REVISION_VERSION =\"\ $(REVISION)\"
-- 
1.7.4.1

Re: [B.A.T.M.A.N.] [PATCH 1/2] batctl: Remove obsolete creation of source packages

[Marek Lindner]

On Thursday 31 March 2011 18:11:37 Sven Eckelmann wrote:
> The creation of source packages is now either done by the release team
> using special scripts or through gitweb. It is not needed to provide the
> source target inside the Makefile and may not work in the future anyway.

Applied in revision g2f267d7.

Thanks,
Marek

Re: [B.A.T.M.A.N.] [PATCH 2/2] batctl: Remove subversion/svk revision information

[Marek Lindner]

On Thursday 31 March 2011 18:11:39 Sven Eckelmann wrote:
> The current version of batctl cannot be obtained from subversion or svk
> anymore. It is unnecessary to provide the functionality to retrieve the
> current revision using these tools.
> 
> We only have to differenciate between git checkout and official release.
> We cannot detect a git snapshot and thus the distribution has to provide
> the REVISION variable for snapshots.

Applied in revision g88b75a3.

Thanks,
Marek

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Remove subversion/svk revision information

[Marek Lindner]

On Thursday 31 March 2011 18:11:38 Sven Eckelmann wrote:
> The current version of batman-adv cannot be obtained from subversion or
> svk anymore. It is unnecessary to provide the functionality to retrieve
> the current revision using these tools.
> 
> We only have to differenciate between git checkout and official release.
> We cannot detect a git snapshot and thus the distribution has to provide
> the REVISION variable for snapshots.

Applied in revision g0836d08.

Thanks,
Marek