diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-08-08 17:05:33 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-08-09 02:20:34 +0200 |
| commit | 71f835fdeb2a7c37cdc3a5228e7ebc0e76efc8bd (patch) | |
| tree | 6eeb8cac5728827ef72c2d6640157ed91f7414d7 /batman-adv | |
| parent | 259cb6eada082c0c439a14acf9ba607fcc231b20 (diff) | |
batman-adv: 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>
Diffstat (limited to 'batman-adv')
| -rw-r--r-- | batman-adv/Makefile | 4 | ||||
| -rw-r--r-- | batman-adv/files/compat-hacks.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/batman-adv/Makefile b/batman-adv/Makefile index c45cbb4..5d5f6ac 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> |