* [Buildroot] [git commit branch/2021.02.x] package/batman-adv: fix compile with BR2_PACKAGE_BATMAN_ADV_BATMAN_V disabled
@ 2021-03-23 15:48 Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2021-03-23 15:48 UTC (permalink / raw
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=acf850e65d1e95047df62c0bc95a15727aa33019
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x
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 at 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>
---
package/batman-adv/batman-adv.mk | 10 ++++++----
1 file 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [git commit branch/2021.02.x] package/batman-adv: fix compile with BR2_PACKAGE_BATMAN_ADV_BATMAN_V disabled
@ 2021-03-23 15:48 Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2021-03-23 15:48 UTC (permalink / raw
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=1c7acbf3a78d1bd207045ce51226493d40352a80
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x
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 <christian@paral.in>
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[yann.morin.1998 at free.fr: add blurb about tests on previous commit]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 20b9724ee25d61d6ee23a43057886d64eb8ddbda)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-23 15:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-23 15:48 [Buildroot] [git commit branch/2021.02.x] package/batman-adv: fix compile with BR2_PACKAGE_BATMAN_ADV_BATMAN_V disabled Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2021-03-23 15:48 Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).