diff mbox series

[v1,2/2] package/batman-adv: bump version to 2021.0

Message ID 20210311210804.9616-2-ps.report@gmx.net
State Accepted
Headers show
Series [v1,1/2] package/batctl: bump version to 2021.0 | expand

Commit Message

Peter Seiderer March 11, 2021, 9:08 p.m. UTC
For details see [1].

[1] https://www.open-mesh.org/news/100

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/batman-adv/batman-adv.hash | 10 +++++-----
 package/batman-adv/batman-adv.mk   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Christian Stewart March 12, 2021, 9:59 p.m. UTC | #1
Hi Peter,

On Thu, Mar 11, 2021 at 1:08 PM Peter Seiderer <ps.report@gmx.net> wrote:
> -BATMAN_ADV_VERSION = 2019.3
> +BATMAN_ADV_VERSION = 2021.0

I get build errors against 2 different device kernels (x86_64 and pi4):

LD [M]  /build/batman-adv-2021.0/net/batman-adv/batman-adv.o
MODPOST /build/batman-adv-2021.0/net/batman-adv/Module.symvers
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!

Possibly the package makefile needs to be updated?

thanks,
Christian
Peter Seiderer March 12, 2021, 10:09 p.m. UTC | #2
Hello Christian,

On Fri, 12 Mar 2021 13:59:18 -0800, Christian Stewart <christian@paral.in> wrote:

> Hi Peter,
>
> On Thu, Mar 11, 2021 at 1:08 PM Peter Seiderer <ps.report@gmx.net> wrote:
> > -BATMAN_ADV_VERSION = 2019.3
> > +BATMAN_ADV_VERSION = 2021.0
>
> I get build errors against 2 different device kernels (x86_64 and pi4):
>
> LD [M]  /build/batman-adv-2021.0/net/batman-adv/batman-adv.o
> MODPOST /build/batman-adv-2021.0/net/batman-adv/Module.symvers
> 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!
>
> Possibly the package makefile needs to be updated?

For me the update fixed the compile for RPi4_64 ;-), can you share your
defconfig(s)?

Regards,
Peter

>
> thanks,
> Christian
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Christian Stewart March 12, 2021, 11:51 p.m. UTC | #3
Hi Peter,

On Fri, Mar 12, 2021 at 2:09 PM Peter Seiderer <ps.report@gmx.net> wrote:
> > On Thu, Mar 11, 2021 at 1:08 PM Peter Seiderer <ps.report@gmx.net> wrote:
> > > -BATMAN_ADV_VERSION = 2019.3
> > > +BATMAN_ADV_VERSION = 2021.0
> >
> > I get build errors against 2 different device kernels (x86_64 and pi4):
> >
> > LD [M]  /build/batman-adv-2021.0/net/batman-adv/batman-adv.o
> > MODPOST /build/batman-adv-2021.0/net/batman-adv/Module.symvers
> > 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!
> >
> > Possibly the package makefile needs to be updated?
>
> For me the update fixed the compile for RPi4_64 ;-), can you share your
> defconfig(s)?

OK, I see what happened here. I just ran "make batman-adv" in an
existing tree without enabling the Kconfig options.

The problem is when batman adv protocol version 5 is not enabled:

BR2_PACKAGE_BATMAN_ADV=y
# BR2_PACKAGE_BATMAN_ADV_DEBUG is not set
# BR2_PACKAGE_BATMAN_ADV_NC is not set
# BR2_PACKAGE_BATMAN_ADV_BATMAN_V is not set

That's causing the "batadv_v_init" undefined errors.

Best regards,
Christian Stewart

>
> Regards,
> Peter
>
> >
> > thanks,
> > Christian
> > _______________________________________________
> > buildroot mailing list
> > buildroot@busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
Yann E. MORIN March 14, 2021, 12:42 p.m. UTC | #4
Christian, Peter, All,

On 2021-03-12 15:51 -0800, Christian Stewart spake thusly:
> On Fri, Mar 12, 2021 at 2:09 PM Peter Seiderer <ps.report@gmx.net> wrote:
> > > On Thu, Mar 11, 2021 at 1:08 PM Peter Seiderer <ps.report@gmx.net> wrote:
> > > > -BATMAN_ADV_VERSION = 2019.3
> > > > +BATMAN_ADV_VERSION = 2021.0
> > > I get build errors against 2 different device kernels (x86_64 and pi4):
[--SNIP--]
> > For me the update fixed the compile for RPi4_64 ;-), can you share your
> > defconfig(s)?
> OK, I see what happened here. I just ran "make batman-adv" in an
> existing tree without enabling the Kconfig options.
> 
> The problem is when batman adv protocol version 5 is not enabled:
> 
> BR2_PACKAGE_BATMAN_ADV=y
> # BR2_PACKAGE_BATMAN_ADV_DEBUG is not set
> # BR2_PACKAGE_BATMAN_ADV_NC is not set
> # BR2_PACKAGE_BATMAN_ADV_BATMAN_V is not set
> 
> That's causing the "batadv_v_init" undefined errors.

So is this an actual issue that still needs to be addressed, or can the
patch be applied now?

Regards,
Yann E. MORIN.
Peter Seiderer March 14, 2021, 9:18 p.m. UTC | #5
Hello Christian, Yann,

On Sun, 14 Mar 2021 13:42:49 +0100, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Christian, Peter, All,
>
> On 2021-03-12 15:51 -0800, Christian Stewart spake thusly:
> > On Fri, Mar 12, 2021 at 2:09 PM Peter Seiderer <ps.report@gmx.net> wrote:
> > > > On Thu, Mar 11, 2021 at 1:08 PM Peter Seiderer <ps.report@gmx.net> wrote:
> > > > > -BATMAN_ADV_VERSION = 2019.3
> > > > > +BATMAN_ADV_VERSION = 2021.0
> > > > I get build errors against 2 different device kernels (x86_64 and pi4):
> [--SNIP--]
> > > For me the update fixed the compile for RPi4_64 ;-), can you share your
> > > defconfig(s)?
> > OK, I see what happened here. I just ran "make batman-adv" in an
> > existing tree without enabling the Kconfig options.
> >
> > The problem is when batman adv protocol version 5 is not enabled:
> >
> > BR2_PACKAGE_BATMAN_ADV=y
> > # BR2_PACKAGE_BATMAN_ADV_DEBUG is not set
> > # BR2_PACKAGE_BATMAN_ADV_NC is not set
> > # BR2_PACKAGE_BATMAN_ADV_BATMAN_V is not set
> >
> > That's causing the "batadv_v_init" undefined errors.
>
> So is this an actual issue that still needs to be addressed, or can the
> patch be applied now?

I can confirm the compile failure in case BR2_PACKAGE_BATMAN_ADV_BATMAN_V is
not enabled...., but the buildroot config still states it is 'exerpimental':


	config BR2_PACKAGE_BATMAN_ADV_BATMAN_V
        	bool "enable B.A.T.M.A.N. V protocol (experimental)"

According to [1] CONFIG_BATMAN_ADV_BATMAN_V option is enabled by default
since 2018.2 (and it seems compile without is not tested very carefully),
maybe time to drop the buildroot config option and always enable
CONFIG_BATMAN_ADV_BATMAN_V?

But will take a deeper look at the source code if the failure is fixable
(or post an upstream failure report)...

Regards,
Peter


https://git.open-mesh.org/batman-adv.git/blob/HEAD:/CHANGELOG.rst#l174

>
> Regards,
> Yann E. MORIN.
>
Yann E. MORIN March 14, 2021, 9:48 p.m. UTC | #6
Peter, All,

On 2021-03-14 22:18 +0100, Peter Seiderer spake thusly:
> I can confirm the compile failure in case BR2_PACKAGE_BATMAN_ADV_BATMAN_V is
> not enabled...., but the buildroot config still states it is 'exerpimental':
[--SNIP--]
> According to [1] CONFIG_BATMAN_ADV_BATMAN_V option is enabled by default
> since 2018.2 (and it seems compile without is not tested very carefully),
> maybe time to drop the buildroot config option and always enable
> CONFIG_BATMAN_ADV_BATMAN_V?

I am perfectly OK with dropping the option and always enabling it.

> But will take a deeper look at the source code if the failure is fixable
> (or post an upstream failure report)...

Cool, thanks! :-)

Regards,
Yann E. MORIN.
Peter Seiderer March 14, 2021, 10:39 p.m. UTC | #7
Hello Yann, Christian,

On Sun, 14 Mar 2021 22:48:24 +0100, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Peter, All,
>
> On 2021-03-14 22:18 +0100, Peter Seiderer spake thusly:
> > I can confirm the compile failure in case BR2_PACKAGE_BATMAN_ADV_BATMAN_V is
> > not enabled...., but the buildroot config still states it is 'exerpimental':
> [--SNIP--]
> > According to [1] CONFIG_BATMAN_ADV_BATMAN_V option is enabled by default
> > since 2018.2 (and it seems compile without is not tested very carefully),
> > maybe time to drop the buildroot config option and always enable
> > CONFIG_BATMAN_ADV_BATMAN_V?
>
> I am perfectly OK with dropping the option and always enabling it.
>
> > But will take a deeper look at the source code if the failure is fixable
> > (or post an upstream failure report)...
>
> Cool, thanks! :-)

Seems to be no batman failure but a buildroot defect (see [1]), but
nevertheless provided an additional patch to change the default
(and remove the 'experimental' comment, see [2])...

Regards,
Peter

[1] https://patchwork.ozlabs.org/project/buildroot/patch/20210314223207.13460-1-ps.report@gmx.net/
[2] https://patchwork.ozlabs.org/project/buildroot/patch/20210314223207.13460-2-ps.report@gmx.net/

>
> Regards,
> Yann E. MORIN.
>
Yann E. MORIN March 16, 2021, 9:09 p.m. UTC | #8
Peter, All,

On 2021-03-11 22:08 +0100, Peter Seiderer spake thusly:
> For details see [1].
> 
> [1] https://www.open-mesh.org/news/100
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Now that the issue has been resolved with your other patches: applied to
master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/batman-adv/batman-adv.hash | 10 +++++-----
>  package/batman-adv/batman-adv.mk   |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash
> index dabbec8120..2422723f40 100644
> --- a/package/batman-adv/batman-adv.hash
> +++ b/package/batman-adv/batman-adv.hash
> @@ -1,7 +1,7 @@
> -# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2019.3.tar.gz.{md5,sha1}
> -md5  39345688ddf12a542853b2318325f07b         batman-adv-2019.3.tar.gz
> -sha1 202539c0cbf4604f6c8e9d427b338d4e807bd220 batman-adv-2019.3.tar.gz
> +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.0/batman-adv-2021.0.tar.gz.sha1
> +sha1  7edd4dfb9434f80adf791990d4e383c7ef80a256  batman-adv-2021.0.tar.gz
>  
>  # Hash for license files
> -sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0
> -sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
> +sha256  5a989ba580897268373bd516b87b588061f344af773a0f6b038a3d8d2af028a1  batman-adv-2021.0.tar.gz
> +sha256  cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025  LICENSES/preferred/GPL-2.0
> +sha256  323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f  LICENSES/preferred/MIT
> diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk
> index 3f48e62051..bd648b5a6c 100644
> --- a/package/batman-adv/batman-adv.mk
> +++ b/package/batman-adv/batman-adv.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -BATMAN_ADV_VERSION = 2019.3
> +BATMAN_ADV_VERSION = 2021.0
>  BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
>  BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
>  BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
> -- 
> 2.30.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash
index dabbec8120..2422723f40 100644
--- a/package/batman-adv/batman-adv.hash
+++ b/package/batman-adv/batman-adv.hash
@@ -1,7 +1,7 @@ 
-# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2019.3.tar.gz.{md5,sha1}
-md5  39345688ddf12a542853b2318325f07b         batman-adv-2019.3.tar.gz
-sha1 202539c0cbf4604f6c8e9d427b338d4e807bd220 batman-adv-2019.3.tar.gz
+# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.0/batman-adv-2021.0.tar.gz.sha1
+sha1  7edd4dfb9434f80adf791990d4e383c7ef80a256  batman-adv-2021.0.tar.gz
 
 # Hash for license files
-sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0
-sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
+sha256  5a989ba580897268373bd516b87b588061f344af773a0f6b038a3d8d2af028a1  batman-adv-2021.0.tar.gz
+sha256  cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025  LICENSES/preferred/GPL-2.0
+sha256  323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f  LICENSES/preferred/MIT
diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk
index 3f48e62051..bd648b5a6c 100644
--- a/package/batman-adv/batman-adv.mk
+++ b/package/batman-adv/batman-adv.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-BATMAN_ADV_VERSION = 2019.3
+BATMAN_ADV_VERSION = 2021.0
 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
 BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
 BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT