From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 27 Mar 2008 18:42:10 +0000 (+0000)
Subject: Upgrade batman to revision 989 (#3259)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=cf8542df88a611a37d7910dcc468d488f71f5309

Upgrade batman to revision 989 (#3259)

SVN-Revision: 10676
---

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index c550265da1..f7ebfbbb99 100644
--- 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
index d80b93833c..0000000000
--- 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 0184c67a84..74d85673c7 100644
--- 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