summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlindnermarek2016-08-24 09:42:10 +0000
committerGitHub2016-08-24 09:42:10 +0000
commit96d00199991eac7d6c29e8d08458e12750489e82 (patch)
tree5709ba4f2081964f133731cfb2df332cee3ff3dd
parent5976aadc66e02dadea924f38f50ca74d7f5150cf (diff)
parent71f835fdeb2a7c37cdc3a5228e7ebc0e76efc8bd (diff)
downloadrouting-96d00199991eac7d6c29e8d08458e12750489e82.tar.gz
Merge pull request #221 from NeoRaider/batman-adv-version
batman-adv: move CONFIG_MODULE_STRIPPED hack to compat-hacks.h
-rw-r--r--batman-adv/Makefile4
-rw-r--r--batman-adv/files/compat-hacks.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 1668083..2a1335c 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv
PKG_VERSION:=2016.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -83,8 +83,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/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index a910c2d..cdf397d 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/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>