batman-adv: tweak the Makefile for dynamically patch 'main.h' via 'sed' by inserting...

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index b23abed8cbcb64d26b7381d995b8bb476980ef84..eda923f2bed8b393c3e58bf28c9d697eecc4cf08 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -114,6 +114,13 @@ define Build/Patch
        $(BATCTL_PATCH)
 endef
 
+define Build/Prepare
+       $(call Build/Prepare/Default)
+       $(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \
+               $(PKG_BUILD_DIR)/main.h
+endef
+
+
 define Build/Compile
        $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS)
        $(BATCTL_BUILD)

diff --git a/batman-adv/patches/0001-batman-adv-avoid-openwrt_metadata_stripping b/batman-adv/patches/0001-batman-adv-avoid-openwrt_metadata_stripping
deleted file mode 100644 (file)
index 471a7ae..0000000
--- a/batman-adv/patches/0001-batman-adv-avoid-openwrt_metadata_stripping
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-