From 2f54cd50a3c06429d2887428088c788c04dcbc8f Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 19 May 2020 14:38:03 +0200 Subject: [PATCH 1/2] batman-adv: use KERNEL_MAKE_FLAGS for kernel module compilation It is easier to use the global define than to manually keep track of the changes in the various kernel module makefiles in the main OpenWrt repository and feeds. Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 2540f3f..3432986 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2020.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) @@ -75,8 +75,7 @@ NOSTDINC_FLAGS = \ define Build/Compile $(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ + $(KERNEL_MAKE_FLAGS) \ M="$(PKG_BUILD_DIR)/net/batman-adv" \ $(PKG_EXTRA_KCONFIG) \ EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \ From aa8705683e217601ee6c2d3b0f3792fe46ec94cb Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 19 May 2020 14:43:56 +0200 Subject: [PATCH 2/2] batman-adv: Provide mac80211's config settings The mac80211 headers might depend on the actual configuration of mac80211 to generate an ABI compatible structure definition. batman-adv must therefore include the header with these config definitions. Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 3432986..6ad207d 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -69,6 +69,7 @@ NOSTDINC_FLAGS = \ -I$(STAGING_DIR)/usr/include/mac80211 \ -I$(STAGING_DIR)/usr/include/mac80211/uapi \ -I$(PKG_BUILD_DIR)/include/ \ + -include backport/autoconf.h \ -include backport/backport.h \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ -DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)-openwrt-$(PKG_RELEASE)\\\"