commits April 2011

commits@lists.open-mesh.org

1 participants
94 discussions

batman-adv; branch, master, updated. v2011.0.0-72-ga9125b6
by postmaster＠open-mesh.org 01 Apr '11

01 Apr '11

The following commit has been merged in the master branch: commit a9125b62d6181601afc36b49cce944f04555e398 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Apr 1 08:49:18 2011 +0200 batman-adv: Add missing static for softif_neigh_deselect 053e6e6c30c161c218eacf2eb2eb4c7ecc0f387c forgot to mark the only locally used function softif_neigh_deselect as static. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index 599b668..58ce440 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -123,7 +123,7 @@ static void softif_neigh_select(struct bat_priv *bat_priv, spin_unlock_bh(&bat_priv->softif_neigh_lock); } -void softif_neigh_deselect(struct bat_priv *bat_priv) +static void softif_neigh_deselect(struct bat_priv *bat_priv) { softif_neigh_select(bat_priv, NULL); } -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.0.0-71-g0836d08
by postmaster＠open-mesh.org 01 Apr '11

01 Apr '11

The following commit has been merged in the master branch: commit 0836d0862914142a1dcfe1c8fb378f85e8c1f750 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 31 18:11:38 2011 +0200 batman-adv: Remove subversion/svk revision information 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(a)narfation.org> 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) -- batman-adv

1 0

batctl; branch, master, updated. v2011.0.0-15-g88b75a3
by postmaster＠open-mesh.org 01 Apr '11

01 Apr '11

The following commit has been merged in the master branch: commit 2f267d7e2d671eaa2a434963d7f93663b787b1fb Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 31 18:11:37 2011 +0200 batctl: 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 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) -- batctl

1 0

batctl; branch, master, updated. v2011.0.0-15-g88b75a3
by postmaster＠open-mesh.org 01 Apr '11

01 Apr '11

The following commit has been merged in the master branch: commit 88b75a3416dec00a1a43e690491278abee511d3e Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 31 18:11:39 2011 +0200 batctl: Remove subversion/svk revision information 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(a)narfation.org> 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)\" -- batctl

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2011