Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch : master

commit 1c8a672c7897105bb00a7121be5ad360488fd440 Author: Matthias Schiffer mschiffer@universe-factory.net Date: Mon Aug 8 17:05:33 2016 +0200

batman-adv-devel: move CONFIG_MODULE_STRIPPED hack to compat-hacks.h

The CONFIG_MODULE_STRIPPED hack broke some time ago, as it is undefined too late (after the headers using it have been included by compat-hacks.h).

Undefine CONFIG_MODULE_STRIPPED at the top of compat-hacks.h instead to make the module version available to batctl again.

Signed-off-by: Matthias Schiffer mschiffer@universe-factory.net

1c8a672c7897105bb00a7121be5ad360488fd440 batman-adv-devel/Makefile | 2 -- batman-adv-devel/files/compat-hacks.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 4fa20ab..40bb493 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -92,8 +92,6 @@ endef define Build/Prepare $(call Build/Prepare/Default) $(CP) ./files/compat-hacks.h $(PKG_BUILD_DIR)/ - $(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a#undef CONFIG_MODULE_STRIPPED' \ - $(PKG_BUILD_DIR)/net/batman-adv/main.h endef

define Build/Clean diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index e8b064c..e959ca3 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -1,5 +1,7 @@ /* Please avoid adding hacks here - instead add it to mac80211/backports.git */

+#undef CONFIG_MODULE_STRIPPED + #include <linux/version.h> /* LINUX_VERSION_CODE */ #include <linux/types.h>