aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Seiderer <ps.report@gmx.net>2021-03-14 23:32:06 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-03-23 18:21:10 +0100
commitcf2cd27a23d38b41ef526ebbaca5b2238e2642eb (patch)
tree4bf40a4c787f6d2d11ee499c656ecdf4d8ab29e3
parenta42d58a2084fc79f4d59ce12282997216169a4a5 (diff)
downloadbuildroot-cf2cd27a23d38b41ef526ebbaca5b2238e2642eb.tar.gz
buildroot-cf2cd27a23d38b41ef526ebbaca5b2238e2642eb.tar.bz2
package/batman-adv: fix compile with BR2_PACKAGE_BATMAN_ADV_BATMAN_V disabled
The given 'CONFIG_BATMAN_ADV_BATMAN_V=' is enough to trigger the wrong code compile path in net/batman-adv/bat_v.h missing the static inline dummy implementations. Fixes: ERROR: modpost: "batadv_v_mesh_free" [.../build/batman-adv-2021.0/net/batman-adv/batman-adv.ko] undefined! ERROR: modpost: "batadv_v_mesh_init" [.../build/batman-adv-2021.0/net/batman-adv/batman-adv.ko] undefined! ERROR: modpost: "batadv_v_hardif_init" [.../build/batman-adv-2021.0/net/batman-adv/batman-adv.ko] undefined! ERROR: modpost: "batadv_v_init" [.../build/batman-adv-2021.0/net/batman-adv/batman-adv.ko] undefined! Signed-off-by: Peter Seiderer <ps.report@gmx.net> [yann.morin.1998@free.fr: - move all conditional options together - slight cleanup/reorganise ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit e8b1eeb2f3f5f0bfd089704ccad57e5665f5813a) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/batman-adv/batman-adv.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk
index 3f48e62051..bfa573643d 100644
--- a/package/batman-adv/batman-adv.mk
+++ b/package/batman-adv/batman-adv.mk
@@ -9,23 +9,25 @@ BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-a
BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
-# Bridge Loop Avoidance, Distributed Arp Table are always enabled
BATMAN_ADV_CFLAGS = \
-I$(@D)/compat-include/ \
-I$(@D)/include/ \
-include $(@D)/compat.h \
-DBATADV_SOURCE_VERSION=\"\\\"$(BATMAN_ADV_VERSION)\\\"\"
+
+# Bridge Loop Avoidance, Distributed Arp Table are always enabled
BATMAN_ADV_MODULE_MAKE_OPTS = \
KVER=$(LINUX_VERSION_PROBED) \
INSTALL_MOD_DIR=updates/net/batman-adv \
NOSTDINC_FLAGS="$(BATMAN_ADV_CFLAGS)" \
CONFIG_BATMAN_ADV=m \
- CONFIG_BATMAN_ADV_BATMAN_V=$(BR2_PACKAGE_BATMAN_ADV_BATMAN_V) \
CONFIG_BATMAN_ADV_BLA=y \
CONFIG_BATMAN_ADV_DAT=y \
- CONFIG_BATMAN_ADV_DEBUG=$(BR2_PACKAGE_BATMAN_ADV_DEBUG) \
CONFIG_BATMAN_ADV_MCAST=y \
- CONFIG_BATMAN_ADV_NC=$(BR2_PACKAGE_BATMAN_ADV_NC)
+ $(if $(BR2_PACKAGE_BATMAN_ADV_BATMAN_V), CONFIG_BATMAN_ADV_BATMAN_V=y) \
+ $(if $(BR2_PACKAGE_BATMAN_ADV_DEBUG), CONFIG_BATMAN_ADV_DEBUG=y) \
+ $(if $(BR2_PACKAGE_BATMAN_ADV_NC), CONFIG_BATMAN_ADV_NC=y)
+
BATMAN_ADV_MODULE_SUBDIRS = net/batman-adv
define BATMAN_ADV_CONFIGURE_CMDS