Merge branch 'master' of github.com:openwrt-routing/packages

diff --git a/batman-adv/patches/0001-batman-adv-avoid-openwrt_metadata_stripping b/batman-adv/patches/0001-batman-adv-avoid-openwrt_metadata_stripping
new file mode 100644 (file)
index 0000000..471a7ae
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-avoid-openwrt_metadata_stripping
@@ -0,0 +1,33 @@
+Date: Fri,  6 Sep 2013 15:14:41 +0200
+From: Antonio Quartulli <ordex@autistici.org>
+To: b.a.t.m.a.n@lists.open-mesh.org
+Cc: Antonio Quartulli <ordex@autistici.org>
+Subject: [B.A.T.M.A.N.] [PATCH openwrt-feed only] batman-adv: fix metadata stripping
+
+a new optimisation in openwrt is stripping some metadata information, invluding
+the module version which is used by batctl to tell the user which version
+batman-adv the node is currently running.
+
+Un-define this constant to prevent the metadata from being stripped
+
+Signed-off-by: Antonio Quartulli <ordex@autistici.org>
+---
+ main.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/main.h b/main.h
+index 834b1a0..b329e79 100644
+--- a/main.h
++++ b/main.h
+@@ -20,6 +20,8 @@
+ #ifndef _NET_BATMAN_ADV_MAIN_H_
+ #define _NET_BATMAN_ADV_MAIN_H_
+ 
++#undef CONFIG_MODULE_STRIPPED
++
+ #define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek@yahoo.de>, " \
+                            "Simon Wunderlich <siwu@hrz.tu-chemnitz.de>"
+ #define BATADV_DRIVER_DESC   "B.A.T.M.A.N. advanced"
+-- 
+1.8.1.5
+