Upgrade batman to revision 989 (#3259)

SVN-Revision: 10676

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index c550265da187846f4d820ce3f66f1159e5f8e6cb..f7ebfbbb995cd2371bd7f16b7a9c69d83d497f07 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batmand-adv
-PKG_REV:=963
+PKG_REV:=989
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 PKG_BRANCH:=batman-adv-userspace

diff --git a/net/batman-advanced/patches/001-extra_cflags.patch b/net/batman-advanced/patches/001-extra_cflags.patch
deleted file mode 100644 (file)
index d80b938..0000000
--- a/net/batman-advanced/patches/001-extra_cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN batman-adv-r963/batman-adv-kernelland/batman-core/Makefile.kbuild batman-adv-r963.new/batman-adv-kernelland/batman-core/Makefile.kbuild
---- batman-adv-r963/batman-adv-kernelland/batman-core/Makefile.kbuild  2008-01-28 08:47:47.000000000 +0100
-+++ batman-adv-r963.new/batman-adv-kernelland/batman-core/Makefile.kbuild      2008-03-02 18:35:39.000000000 +0100
-@@ -23,7 +23,7 @@
- -include $(TOPDIR)/Rules.make
- endif
- 
--CFLAGS += -DREVISION_VERSION=\"\ rv$(REVISION)\"
-+EXTRA_CFLAGS += -DREVISION_VERSION=\"\ rv$(REVISION)\"
- 
- obj-m += batman-adv-core.o
- batman-adv-core-objs := batman-adv-main.o batman-adv-proc.o batman-adv-send.o batman-adv-log.o batman-adv-routing.o batman-adv-interface.o batman-adv-device.o batman-adv-ttable.o bitarray.o hash.o ring_buffer.o

diff --git a/net/batman/Makefile b/net/batman/Makefile
index 0184c67a84290d3f46ee28415e20ebe70206ba8e..74d85673c78d8cba9a98c9e265dbe38925b3a923 100644 (file)
--- a/net/batman/Makefile
+++ b/net/batman/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batmand
-PKG_REV:=963
+PKG_REV:=989
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 PKG_BRANCH:=batman