commits December 2011

commits@lists.open-mesh.org

1 participants
80 discussions

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 16fb08cd48ca74f77cba9bb52a09d63d8bb97a06 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:33 2011 +0200 batmand: 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 3ac2885..2514c2d --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +#!/usr/bin/make -f +# -*- makefile -*- # # Copyright (C) 2006-2009 B.A.T.M.A.N. contributors # -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit ed8b80e9b7bfb50d65cf6e09becd5eb7618bdc0f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:35 2011 +0200 batmand: Only define CC when not already specified It is possible that a build environment specifies the CC different than gcc (for example gcc-4.6). The Makefile should only set it when the compiler wasn't explicitely set. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 3b517da..804bdd4 100755 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ endif # activate this variable to deactivate policy routing for backward compatibility #NO_POLICY_ROUTING = -DNO_POLICY_ROUTING -CC = gcc +CC ?= gcc CFLAGS += -pedantic -Wall -W -std=gnu99 EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lpthread -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 826baf4b7ebfaa0ffd02ddd9b7de2051de9577e1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:36 2011 +0200 batmand: Build binary before installing it Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 804bdd4..df2f5b2 100755 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ $(BINARY_NAME): $(OBJ) Makefile clean: rm -f $(BINARY_NAME) $(OBJ) $(DEP) -install: +install: $(BINARY_NAME) mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit c04924f78058e670e295c8eb2871f1ca148d3836 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:37 2011 +0200 batmand: Reorder Makefile for better readability Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index df2f5b2..a25f3fc 100755 --- a/Makefile +++ b/Makefile @@ -18,24 +18,8 @@ # 02110-1301, USA # -ifneq ($(findstring $(MAKEFLAGS),s),s) -ifndef V - Q_CC = @echo ' ' CC $@; - Q_LD = @echo ' ' LD $@; - export Q_CC - export Q_LD -endif -endif - -# activate this variable to deactivate policy routing for backward compatibility -#NO_POLICY_ROUTING = -DNO_POLICY_ROUTING - -CC ?= gcc -CFLAGS += -pedantic -Wall -W -std=gnu99 -EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) -LDFLAGS += -lpthread - -SBINDIR = $(INSTALL_PREFIX)/usr/sbin +# batmand build +BINARY_NAME = batmand UNAME = $(shell uname) POSIX_OBJ = posix/init.o posix/posix.o posix/tunnel.o posix/unix_socket.o @@ -64,24 +48,45 @@ OS_OBJ = $(BSD_OBJ) $(POSIX_OBJ) endif OBJ = batman.o originator.o schedule.o list-batman.o allocate.o bitarray.o hash.o profile.o ring_buffer.o hna.o $(OS_OBJ) -DEP = $(OBJ:.o=.d) -BINARY_NAME = batmand +# activate this variable to deactivate policy routing for backward compatibility +#NO_POLICY_ROUTING = -DNO_POLICY_ROUTING -REVISION= $(shell if [ -d .git ]; then \ - echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \ - fi) -REVISION_VERSION =\"\ $(REVISION)\" +# batmand flags and options +CFLAGS += -pedantic -Wall -W -std=gnu99 +EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) +LDFLAGS += -lpthread +# disable verbose output +ifneq ($(findstring $(MAKEFLAGS),s),s) +ifndef V + Q_CC = @echo ' ' CC $@; + Q_LD = @echo ' ' LD $@; + export Q_CC + export Q_LD +endif +endif -all: $(BINARY_NAME) +# standard build tools +CC ?= gcc -$(BINARY_NAME): $(OBJ) Makefile - $(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS) +# standard install paths +SBINDIR = $(INSTALL_PREFIX)/usr/sbin + +# try to generate revision +REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) +REVISION_VERSION =\"\ $(REVISION)\" +# default target +all: $(BINARY_NAME) + +# standard build rules +.SUFFIXES: .o .c .c.o: $(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@ --include $(DEP) + +$(BINARY_NAME): $(OBJ) Makefile + $(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS) clean: rm -f $(BINARY_NAME) $(OBJ) $(DEP) @@ -90,4 +95,8 @@ install: $(BINARY_NAME) mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) +# load dependencies +DEP = $(OBJ:.o=.d) +-include $(DEP) + .PHONY: all clean install -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit eb3e9d097b83ed3ab6a1c6a5073800c8ebfecc6e Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 22:34:19 2011 +0200 batmand: Use non-blocking ioctl to fix FTBFS with linux >= 2.6.35 The batgat ioctl locks the used data structures itself and does not rely on the BKL. The BKL ioctl handler was removed in v2.6.35 can cannot be used anymore. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/linux/modules/gateway.c b/linux/modules/gateway.c index aa58688..63456aa 100644 --- a/linux/modules/gateway.c +++ b/linux/modules/gateway.c @@ -53,7 +53,7 @@ static int proc_clients_read(char *buf, char **start, off_t offset, int size, in static struct file_operations fops = { .open = batgat_open, .release = batgat_release, - .ioctl = batgat_ioctl, + .unlocked_ioctl = batgat_ioctl, }; -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit b3c19ed8b12a70e4a9c38ae04bb64b55d3102588 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 23 13:16:42 2011 +0200 batmand: Fix build of batgat module with linux 3.0 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/linux/modules/Makefile b/linux/modules/Makefile index eccb601..2aa20e1 100644 --- a/linux/modules/Makefile +++ b/linux/modules/Makefile @@ -10,8 +10,8 @@ endif UNAME:=$(shell uname -r) -LINUX26=2.6 -LINUX_VERSION:=$(findstring $(LINUX26),$(UNAME)) +LINUX24=2.4 +LINUX_VERSION:=$(findstring $(LINUX24),$(UNAME)) REVISION:= $(shell if [ -d .svn ]; then \ if which svn > /dev/null; then \ svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; \ @@ -30,14 +30,14 @@ REVISION:= $(shell if [ -d .svn ]; then \ include $(PWD)/Makefile.kbuild -ifneq ($(LINUX_VERSION),$(LINUX26)) +ifeq ($(LINUX_VERSION),$(LINUX24)) TARGET:=batgat INCLUDE:=-I/lib/modules/$(UNAME)/build/include -I/usr/src/kernel-headers-$(UNAME)/include EXTRA_CFLAGS+=-D__KERNEL__ -DMODULE -O2 -Wall $(INCLUDE) CC:=gcc endif -ifeq ($(LINUX_VERSION),$(LINUX26)) +ifneq ($(LINUX_VERSION),$(LINUX24)) all: $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) modules diff --git a/linux/modules/Makefile.kbuild b/linux/modules/Makefile.kbuild index 91982a5..18ac9a7 100644 --- a/linux/modules/Makefile.kbuild +++ b/linux/modules/Makefile.kbuild @@ -2,10 +2,10 @@ ifeq ($(MAKING_MODULES),1) -include $(TOPDIR)/Rules.make endif -LINUX26:=2.6 +LINUX24:=2.4 EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\" -ifeq ($(strip $(findstring $(LINUX26),$(LINUX_VERSION))),$(LINUX26)) +ifneq ($(strip $(findstring $(LINUX24),$(LINUX_VERSION))),$(LINUX24)) obj-m += batgat.o batgat-objs := gateway.o hash.o -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 2899e7a30582492c4655bf33495aa1bd221f9e68 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:06:20 2011 +0200 batmand: 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 8eafb26..0249b10 100644 --- a/Makefile +++ b/Makefile @@ -60,23 +60,15 @@ ifeq ($(UNAME),OpenBSD) OS_C = $(BSD_C) $(POSIX_C) endif -LOG_BRANCH = trunk/batman - -SRC_FILES = "$\.c$\|$\.h$\|$Makefile$\|$INSTALL$\|$LIESMICH$\|$README$\|$THANKS$\|$TRASH$\|$Doxyfile$\|$./posix$\|$./linux$\|$./bsd$\|$./man$\|$./doc$" - SRC_C= batman.c originator.c schedule.c list-batman.c allocate.c bitarray.c hash.c profile.c ring_buffer.c hna.c $(OS_C) SRC_H= batman.h originator.h schedule.h list-batman.h os.h allocate.h bitarray.h hash.h profile.h packet.h types.h ring_buffer.h hna.h SRC_O= $(SRC_C:.c=.o) -PACKAGE_NAME = batmand BINARY_NAME = batmand -SOURCE_VERSION_HEADER = batman.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)\" -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 NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) @@ -90,27 +82,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 posix/*.o linux/*.o bsd/*.o rm -f `find . -name '*.d' -print` - -clean-long: - rm -rf $(PACKAGE_NAME)_* - install: mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 1b5c168b2099ba94b17b6cc96052fd52a3937fa9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:11:31 2011 +0200 batmand: 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 0249b10..c9098a6 100644 --- a/Makefile +++ b/Makefile @@ -66,8 +66,10 @@ SRC_O= $(SRC_C:.c=.o) BINARY_NAME = batmand -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`) diff --git a/linux/modules/Makefile b/linux/modules/Makefile index 2aa20e1..e5f9bbf 100644 --- a/linux/modules/Makefile +++ b/linux/modules/Makefile @@ -12,21 +12,9 @@ endif UNAME:=$(shell uname -r) LINUX24=2.4 LINUX_VERSION:=$(findstring $(LINUX24),$(UNAME)) -REVISION:= $(shell if [ -d .svn ]; then \ - if which svn > /dev/null; then \ - svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; \ - else \ - echo "[unknown]"; \ - fi ; \ - else \ - if [ -d ~/.svk ]; then \ - if which svk > /dev/null; then \ - echo $$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ - else \ - echo "[unknown]"; \ - fi; \ - fi; \ - fi) +REVISION= $(shell if [ -d ../../.git ]; then \ + echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \ + fi) include $(PWD)/Makefile.kbuild diff --git a/linux/modules/Makefile.kbuild b/linux/modules/Makefile.kbuild index 18ac9a7..1be319b 100644 --- a/linux/modules/Makefile.kbuild +++ b/linux/modules/Makefile.kbuild @@ -3,7 +3,7 @@ ifeq ($(MAKING_MODULES),1) endif LINUX24:=2.4 -EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\" +EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ $(REVISION)\" ifneq ($(strip $(findstring $(LINUX24),$(LINUX_VERSION))),$(LINUX24)) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 2f4a8bf99e49fb605bd584123f3cc0493b5a7bf7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 22:34:19 2011 +0200 batmand: Fix FTBFS on second build attempt make clean will try to remove all files and folders which end with *.d. This fails when using the Debian package script on the leftover package folder with etc/init.d included because the rm is not started in recursive deletion mode. This find can be replaced with a simpler statement without using its functionality. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index c9098a6..cb7c950 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ $(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile clean: rm -f $(BINARY_NAME) *.o posix/*.o linux/*.o bsd/*.o - rm -f `find . -name '*.d' -print` + rm -f *.d posix/*.d linux/*.d bsd/*.d install: mkdir -p $(SBINDIR) -- batmand

1 0

vis; branch, pu/makefile_cleanup, deleted. v0.3.2-26-gc016c0c
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The branch, pu/makefile_cleanup has been deleted was c016c0cf016ebe492714e16a8909b17f7638bed8 ----------------------------------------------------------------------- c016c0cf016ebe492714e16a8909b17f7638bed8 vis: Change s3d URL to s3d.sourceforge.net ----------------------------------------------------------------------- -- vis

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2011