commits December 2011

commits@lists.open-mesh.org

1 participants
80 discussions

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 33cf9a758353ede077289b7eece6d8f81926cb25 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:45:15 2011 +0200 vis: Make called tools in clean and install configurable Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index b34d2e8..bd20b1c 100755 --- a/Makefile +++ b/Makefile @@ -39,6 +39,9 @@ endif # standard build tools CC ?= gcc +RM ?= rm -f +INSTALL ?= install +MKDIR ?= mkdir -p COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) @@ -61,11 +64,11 @@ $(BINARY_NAME): $(OBJ) $(LINK.o) $^ $(LDLIBS) -o $@ clean: - rm -f $(BINARY_NAME) $(OBJ) $(DEP) + $(RM) $(BINARY_NAME) $(OBJ) $(DEP) install: $(BINARY_NAME) - mkdir -p $(SBINDIR) - install -m 0755 $(BINARY_NAME) $(SBINDIR) + $(MKDIR) $(SBINDIR) + $(INSTALL) -m 0755 $(BINARY_NAME) $(SBINDIR) # load dependencies DEP = $(OBJ:.o=.d) -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit e478186b9ac8f070822a00a1bb48ff46ae327632 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:45:16 2011 +0200 vis: Rename INSTALL_PREFIX to DESTDIR Makefile generators like cmake or configure (generated by autotools) usually use DESTDIR to allow the modification of the "root" path without affecting other build steps. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index bd20b1c..2ecf090 100755 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) # standard install paths -SBINDIR = $(INSTALL_PREFIX)/usr/sbin +SBINDIR = /usr/sbin # try to generate revision REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) @@ -67,8 +67,8 @@ clean: $(RM) $(BINARY_NAME) $(OBJ) $(DEP) install: $(BINARY_NAME) - $(MKDIR) $(SBINDIR) - $(INSTALL) -m 0755 $(BINARY_NAME) $(SBINDIR) + $(MKDIR) $(DESTDIR)$(SBINDIR) + $(INSTALL) -m 0755 $(BINARY_NAME) $(DESTDIR)$(SBINDIR) # load dependencies DEP = $(OBJ:.o=.d) -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit b226dcaa1c3dc7a70beff6df766c4e8d20c7d218 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:45:17 2011 +0200 vis: Introduce PREFIX as standard installation prefix cmake and configure (generated by autotools) use a prefix configuration which is by default /usr/local to define to which all other paths are relative to. SBINDIR is then defined as $PREFIX/sbin but can also be redefined. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 2ecf090..745b6e3 100755 --- a/Makefile +++ b/Makefile @@ -46,7 +46,8 @@ COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) # standard install paths -SBINDIR = /usr/sbin +PREFIX = /usr/local +SBINDIR = $(PREFIX)/sbin # try to generate revision REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 6223ef363018499b231c5fe1215ddf4abe8ff777 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:34:14 2011 +0200 vis: Remove obsolete creation of source packages 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(a)narfation.org> diff --git a/Makefile b/Makefile index 675dcd8..db1f885 100644 --- a/Makefile +++ b/Makefile @@ -32,23 +32,15 @@ LDFLAGS += -lpthread SBINDIR = $(INSTALL_PREFIX)/usr/sbin -LOG_BRANCH= trunk/vis - -SRC_FILES= "$\.c$\|$\.h$\|$Makefile$\|$INSTALL$\|$LIESMICH$\|$README$\|$THANKS$\|$TRASH$\|$Doxyfile$\|$./posix$\|$./linux$\|$./bsd$\|$./man$\|$./doc$" - SRC_C= allocate.c hash.c list-batman.c vis.c udp_server.c SRC_H= allocate.h hash.h list-batman.h vis.h vis-types.h SRC_O= $(SRC_C:.c=.o) -PACKAGE_NAME= vis BINARY_NAME= vis -SOURCE_VERSION_HEADER= vis.h REVISION:= $(shell if [ -d .svn ]; then svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; else if [ -d ~/.svk ]; then echo $$(svk info | grep "Mirrored From" | awk '{print $$5}'); fi; fi) REVISION_VERSION=\"\ rv$(REVISION)\" -VIS_VERSION= $(shell grep "^\#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}') -FILE_NAME= $(PACKAGE_NAME)_$(VIS_VERSION)-rv$(REVISION)_$@ NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) @@ -62,27 +54,10 @@ $(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 rm -f `find . -name '*.d' -print` - -clean-long: - rm -rf $(PACKAGE_NAME)_* - install: mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 9c767f8fc578222183214001b947f3f6fb1f8928 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:36:52 2011 +0200 vis: Remove subversion/svk revision information The current version of batmand 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(a)narfation.org> diff --git a/Makefile b/Makefile index db1f885..5cd4b00 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,10 @@ SRC_O= $(SRC_C:.c=.o) BINARY_NAME= vis -REVISION:= $(shell if [ -d .svn ]; then svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; else if [ -d ~/.svk ]; then echo $$(svk info | grep "Mirrored From" | awk '{print $$5}'); fi; fi) -REVISION_VERSION=\"\ rv$(REVISION)\" +REVISION= $(shell if [ -d .git ]; then \ + echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \ + fi) +REVISION_VERSION=\"\ $(REVISION)\" NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit f15c90371469fbd2196fb94cec6aa75e35f2a4ef Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:45:05 2011 +0200 vis: Remove optimisation and debugging options Distributions like Gentoo or Debian have to strip the options regarding the optimisation levels and debugging information to fulfil their policies. There is currently no valid reason why the Makefile should override it. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 5cd4b00..ccfcfd5 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ endif endif CC = gcc -CFLAGS += -pedantic -Wall -W -O1 -g3 -std=gnu99 +CFLAGS += -pedantic -Wall -W -std=gnu99 EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lpthread -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 21f0d6faa338d075ee584699daf483c53b2dccc8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:45:06 2011 +0200 vis: Don't automatically build in parallel Distributions like Gentoo and Debian have policies which make it necessary to use some kind of environmental variable to control the parallel build. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index ccfcfd5..f7bcef9 100644 --- a/Makefile +++ b/Makefile @@ -43,11 +43,7 @@ REVISION= $(shell if [ -d .git ]; then \ fi) REVISION_VERSION=\"\ $(REVISION)\" -NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) - - -all: - $(MAKE) -j $(NUM_CPUS) $(BINARY_NAME) +all: $(BINARY_NAME) $(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile $(Q_LD)$(CC) -o $@ $(SRC_O) $(LDFLAGS) -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit cd172b63a7794eb2947853952a0b2b3eb3d60542 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:45:08 2011 +0200 vis: Directly specify objects in Makefile The information about header and source files aren't needed by the Makefile. Only the dependencies to headers provide useful information, but these are automatically included by the generated *.d files. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index f7bcef9..a18aa72 100644 --- a/Makefile +++ b/Makefile @@ -32,9 +32,8 @@ LDFLAGS += -lpthread SBINDIR = $(INSTALL_PREFIX)/usr/sbin -SRC_C= allocate.c hash.c list-batman.c vis.c udp_server.c -SRC_H= allocate.h hash.h list-batman.h vis.h vis-types.h -SRC_O= $(SRC_C:.c=.o) +OBJ = allocate.o hash.o list-batman.o vis.o udp_server.o +DEP = $(OBJ:.o=.d) BINARY_NAME= vis @@ -45,16 +44,15 @@ REVISION_VERSION=\"\ $(REVISION)\" all: $(BINARY_NAME) -$(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile - $(Q_LD)$(CC) -o $@ $(SRC_O) $(LDFLAGS) +$(BINARY_NAME): $(OBJ) Makefile + $(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS) .c.o: $(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@ --include $(SRC_C:.c=.d) +-include $(DEP) clean: - rm -f $(BINARY_NAME) *.o - rm -f `find . -name '*.d' -print` + rm -f $(BINARY_NAME) $(OBJ) $(DEP) install: mkdir -p $(SBINDIR) -- vis

11 years, 3 months

vis; branch, master, updated. v0.3.2-26-g1723d3c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit ca6696af9176470dea70ca5559dfecf31cd5466c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:45:09 2011 +0200 vis: Provide shebang to inform about interpreter Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index a18aa72..d9b011c --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +#!/usr/bin/make -f +# -*- makefile -*- # # Copyright (C) 2006-2009 BATMAN contributors # -- vis

11 years, 3 months

batmand; branch, master, updated. v0.3.2-45-g50aebcf

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 50aebcf2f96c5837f8765c4d0bf0f0020a0e33fb Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 5 20:32:29 2011 +0100 batmand: Remove wrong information about daemon size reduction 33a5773ab39a089870667634e08ce98fad1a2fd1 introduced a regression in the documentation. It recommended to use non-existing options DEBUG_GREATER_2 abd ENABLE_EASTEREGG in the Makefile. Also adding those variables doesn't change the behavior of the build system at all. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/INSTALL b/INSTALL index 58be950..41566ab 100644 --- a/INSTALL +++ b/INSTALL @@ -35,28 +35,6 @@ running, because it requires to install a different kernel. Remove the comment hash (#) leading this line in the Makefile: #NO_POLICY_ROUTING = -DNO_POLICY_ROUTING - -Reducing the batmand daemon size: - -In case you don't need debug output levels greater than 2 (debug level 1 -shows originators, debug level 2 shows Internet gateways), add a -comment hash leading this line in the Makefile: - -DEBUG_GREATER_2 = -DDEBUG - -This will skip tons of debug information from the binary and save about 8 KB. - - -Disable the easter-egg. The developers thought it would be fancy to have a -easter-egg. If you are bartering for every single byte of binary size, you -can disable it as well. Add a hash to this line: - -ENABLE_EASTEREGG = -DEASTEREGG - -This will save another 4 KB. - - - Compiling --------- -- batmand

11 years, 3 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2011