From 20b9724ee25d61d6ee23a43057886d64eb8ddbda Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 16 Mar 2021 19:14:27 +0100 Subject: [PATCH] package/batman-adv: fix compile with BR2_PACKAGE_BATMAN_ADV_BATMAN_V disabled Commit e8b1eeb2f3f5 (package/batman-adv: fix compile with BR2_PACKAGE_BATMAN_ADV_BATMAN_V disabled) was tested against an RPi4 linux kernel already enabling the build-in batman-adv module inlcusive batman-v, hence it missed the case where the in-tree module is not enabled. Taking a deeper look at the configure script gen-compat-autoconf.sh reveals that the batman feature options must be explicitly set to 'y' or 'n' to work as expected. 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! Reported-by: Christian Stewart Signed-off-by: Peter Seiderer [yann.morin.1998@free.fr: add blurb about tests on previous commit] Signed-off-by: Yann E. MORIN --- package/batman-adv/batman-adv.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index bfa573643d..2de92d6543 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -24,9 +24,9 @@ BATMAN_ADV_MODULE_MAKE_OPTS = \ CONFIG_BATMAN_ADV_BLA=y \ CONFIG_BATMAN_ADV_DAT=y \ CONFIG_BATMAN_ADV_MCAST=y \ - $(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) + CONFIG_BATMAN_ADV_BATMAN_V=$(if $(BR2_PACKAGE_BATMAN_ADV_BATMAN_V),y,n) \ + CONFIG_BATMAN_ADV_DEBUG=$(if $(BR2_PACKAGE_BATMAN_ADV_DEBUG),y,n) \ + CONFIG_BATMAN_ADV_NC=$(if $(BR2_PACKAGE_BATMAN_ADV_NC),y,n) BATMAN_ADV_MODULE_SUBDIRS = net/batman-adv -- 2.30.2