Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Matthias Schiffer 2016-08-08 17:05:33 +02:00
parent 259cb6eada
commit 71f835fdeb
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
batman-adv/Makefile
View file

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2016.2 PKG_VERSION:=2016.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90 PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -83,8 +83,6 @@ endef
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
$(CP) ./files/compat-hacks.h $(PKG_BUILD_DIR)/ $(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 endef
define Build/Clean define Build/Clean

2
batman-adv/files/compat-hacks.h
View file

@ -1,5 +1,7 @@
/* Please avoid adding hacks here - instead add it to mac80211/backports.git */ /* 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/version.h> /* LINUX_VERSION_CODE */
#include <linux/types.h> #include <linux/types.h>