NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/batman-adv: fix compile with BR2_PACKAGE_BATMAN_ADV_BATMAN_V disabled

Browse Source 
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>
This commit is contained in:
Peter Seiderer 2021-03-14 23:32:06 +01:00 committed by Yann E. MORIN
parent a7143fb316
commit e8b1eeb2f3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/batman-adv/batman-adv.mk
View File

@ -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 = GPL-2.0, MIT (batman_adv.h)
BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
# Bridge Loop Avoidance, Distributed Arp Table are always enabled
BATMAN_ADV_CFLAGS = \ BATMAN_ADV_CFLAGS = \
-I$(@D)/compat-include/ \ -I$(@D)/compat-include/ \
-I$(@D)/include/ \ -I$(@D)/include/ \
-include $(@D)/compat.h \ -include $(@D)/compat.h \
-DBATADV_SOURCE_VERSION=\"\\\"$(BATMAN_ADV_VERSION)\\\"\" -DBATADV_SOURCE_VERSION=\"\\\"$(BATMAN_ADV_VERSION)\\\"\"
# Bridge Loop Avoidance, Distributed Arp Table are always enabled
BATMAN_ADV_MODULE_MAKE_OPTS = \ BATMAN_ADV_MODULE_MAKE_OPTS = \
KVER=$(LINUX_VERSION_PROBED) \ KVER=$(LINUX_VERSION_PROBED) \
INSTALL_MOD_DIR=updates/net/batman-adv \ INSTALL_MOD_DIR=updates/net/batman-adv \
NOSTDINC_FLAGS="$(BATMAN_ADV_CFLAGS)" \ NOSTDINC_FLAGS="$(BATMAN_ADV_CFLAGS)" \
CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV=m \
CONFIG_BATMAN_ADV_BATMAN_V=$(BR2_PACKAGE_BATMAN_ADV_BATMAN_V) \
CONFIG_BATMAN_ADV_BLA=y \ CONFIG_BATMAN_ADV_BLA=y \
CONFIG_BATMAN_ADV_DAT=y \ CONFIG_BATMAN_ADV_DAT=y \
CONFIG_BATMAN_ADV_DEBUG=$(BR2_PACKAGE_BATMAN_ADV_DEBUG) \
CONFIG_BATMAN_ADV_MCAST=y \ 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 BATMAN_ADV_MODULE_SUBDIRS = net/batman-adv
define BATMAN_ADV_CONFIGURE_CMDS define BATMAN_ADV_CONFIGURE_CMDS