[Buildroot] [PATCH 1/1] package/iproute2: Bump version to 5.11.0

[Buildroot] [PATCH 1/1] package/iproute2: Bump version to 5.11.0

[Petr Vorel]

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Hi,

NOTE: this should not be applied until uclibc based toolchains are
regenerated. But posted for people who don't use uclibc and would like
to have iproute2 sync with kernel version.

Kind regards,
Petr

 package/iproute2/iproute2.hash | 2 +-
 package/iproute2/iproute2.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash
index 4d82de4c46..c7c06bf5f7 100644
--- a/package/iproute2/iproute2.hash
+++ b/package/iproute2/iproute2.hash
@@ -1,3 +1,3 @@
 # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
-sha256  cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e  iproute2-5.8.0.tar.xz
+sha256  c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54  iproute2-5.11.0.tar.xz
 sha256  e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  COPYING
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 98fbe4f3cd..1be94e9a45 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPROUTE2_VERSION = 5.8.0
+IPROUTE2_VERSION = 5.11.0
 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
-- 
2.30.2

[Buildroot] [PATCH 1/1] package/iproute2: Bump version to 5.11.0

[Thomas Petazzoni]

Hello Petr,

On Tue, 23 Mar 2021 19:10:04 +0100
Petr Vorel <petr.vorel@gmail.com> wrote:

> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
> Hi,
> 
> NOTE: this should not be applied until uclibc based toolchains are
> regenerated. But posted for people who don't use uclibc and would like
> to have iproute2 sync with kernel version.

I think they have all been updated now. However, your patch doesn't
apply: it assumes that Buildroot master has iproute2 5.8.0, but we have
5.7.0. And the patch we have in package/iproute2/ doesn't apply to
5.11.0. Could you have a look and respin?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/iproute2: Bump version to 5.11.0

[Petr Vorel]

Hi Thomas,
> Hello Petr,

> On Tue, 23 Mar 2021 19:10:04 +0100
> Petr Vorel <petr.vorel@gmail.com> wrote:

> > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> > ---
> > Hi,

> > NOTE: this should not be applied until uclibc based toolchains are
> > regenerated. But posted for people who don't use uclibc and would like
> > to have iproute2 sync with kernel version.

> I think they have all been updated now. However, your patch doesn't
> apply: it assumes that Buildroot master has iproute2 5.8.0, but we have
> 5.7.0. And the patch we have in package/iproute2/ doesn't apply to
> 5.11.0. Could you have a look and respin?

Sure, I'll send fixed version, sorry for error.

But I tried to build on updated package and it looks like error still exists.
What do I do wrong?

br-test-pkg/bootlin-armv5-uclibc/host/bin/arm-linux-gcc -Wall -Wstrict-prototypes  -Wmissing-prototypes -Wmissing-declarations -Wold-style-definition -Wformat=2 -O2 -pipe -I../include -I../include/uapi -DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib\" -DCONFDIR=\"/etc/iproute2\" -DNETNS_RUN_DIR=\"/var/run/netns\" -DNETNS_ETC_DIR=\"/etc/netns\" -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -DXT_LIB_DIR=\"/usr/lib/xtables\" -DHAVE_SETNS -fPIC   -c -o mpls_pton.o mpls_pton.c
fs.c:204:7: warning: implicit declaration of function ?open_by_handle_at? [-Wimplicit-function-declaration]
  204 |  fd = open_by_handle_at(mnt_fd, fhp, 0);
      |       ^~~~~~~~~~~~~~~~~
fs.c:172:7: warning: unused variable ?fh_buf? [-Wunused-variable]
  172 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };

Kind regards,
Petr

> Thanks a lot!

> Thomas

[Buildroot] [PATCH 1/1] package/iproute2: Bump version to 5.11.0

[Heiko Thiery]

Hi Petr, Hi Thomas,

Am So., 4. Apr. 2021 um 20:35 Uhr schrieb Petr Vorel <petr.vorel@gmail.com>:
>
> Hi Thomas,
> > Hello Petr,
>
> > On Tue, 23 Mar 2021 19:10:04 +0100
> > Petr Vorel <petr.vorel@gmail.com> wrote:
>
> > > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> > > ---
> > > Hi,
>
> > > NOTE: this should not be applied until uclibc based toolchains are
> > > regenerated. But posted for people who don't use uclibc and would like
> > > to have iproute2 sync with kernel version.
>
> > I think they have all been updated now. However, your patch doesn't
> > apply: it assumes that Buildroot master has iproute2 5.8.0, but we have
> > 5.7.0. And the patch we have in package/iproute2/ doesn't apply to
> > 5.11.0. Could you have a look and respin?
>
> Sure, I'll send fixed version, sorry for error.
>
> But I tried to build on updated package and it looks like error still exists.
> What do I do wrong?

I just tried to test the version bump of iproute2 to v5.11 and I see
the same/similar error on utils/pkg-test for
bootlin-armv5-uclibcbootlin-armv5-uclibc.

  109 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
      |                     ^~~~~~
fs.c:124:5: error: dereferencing pointer to incomplete type ?struct file_handle?
  124 |  fhp->handle_bytes = sizeof(__u64);
      |     ^~
fs.c:125:6: warning: implicit declaration of function
?name_to_handle_at? [-Wimplicit-function-declaration]
  125 |  if (name_to_handle_at(AT_FDCWD, path, fhp, &mnt_id, 0) < 0) {
      |      ^~~~~~~~~~~~~~~~~
fs.c:109:7: warning: unused variable ?fh_buf? [-Wunused-variable]
  109 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
      |       ^~~~~~
fs.c: In function ?get_cgroup2_path?:
fs.c:172:21: error: invalid application of ?sizeof? to incomplete type
?struct file_handle?
  172 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
      |                     ^~~~~~
fs.c:200:5: error: dereferencing pointer to incomplete type ?struct file_handle?
  200 |  fhp->handle_bytes = sizeof(__u64);
      |     ^~
fs.c:204:7: warning: implicit declaration of function
?open_by_handle_at? [-Wimplicit-function-declaration]
  204 |  fd = open_by_handle_at(mnt_fd, fhp, 0);
      |       ^~~~~~~~~~~~~~~~~
fs.c:172:7: warning: unused variable ?fh_buf? [-Wunused-variable]
  172 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };

Looks like your patch in uclibc [1] is not in the used version of the
bootlin toolchain [2]. As far as I can see the toolchain uses uclibc
v1.0.34.

[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=8bc41f131b8d70c84c300f14cd64abd448126b43
[2] https://toolchains.bootlin.com/releases_armv5-eabi.html

I think we have to wait until the toolchains will be updated to
include uclibc version 1.0.36 or greater.

Thank you
-- 
Heiko

[Buildroot] [PATCH 1/1] package/iproute2: Bump version to 5.11.0

[Petr Vorel]

Hi Heiko,

> Hi Petr, Hi Thomas,

> Am So., 4. Apr. 2021 um 20:35 Uhr schrieb Petr Vorel <petr.vorel@gmail.com>:

> > Hi Thomas,
> > > Hello Petr,

> > > On Tue, 23 Mar 2021 19:10:04 +0100
> > > Petr Vorel <petr.vorel@gmail.com> wrote:

> > > > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> > > > ---
> > > > Hi,

> > > > NOTE: this should not be applied until uclibc based toolchains are
> > > > regenerated. But posted for people who don't use uclibc and would like
> > > > to have iproute2 sync with kernel version.

> > > I think they have all been updated now. However, your patch doesn't
> > > apply: it assumes that Buildroot master has iproute2 5.8.0, but we have
> > > 5.7.0. And the patch we have in package/iproute2/ doesn't apply to
> > > 5.11.0. Could you have a look and respin?

> > Sure, I'll send fixed version, sorry for error.

> > But I tried to build on updated package and it looks like error still exists.
> > What do I do wrong?

> I just tried to test the version bump of iproute2 to v5.11 and I see
> the same/similar error on utils/pkg-test for
> bootlin-armv5-uclibcbootlin-armv5-uclibc.

>   109 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
>       |                     ^~~~~~
> fs.c:124:5: error: dereferencing pointer to incomplete type ?struct file_handle?
>   124 |  fhp->handle_bytes = sizeof(__u64);
>       |     ^~
> fs.c:125:6: warning: implicit declaration of function
> ?name_to_handle_at? [-Wimplicit-function-declaration]
>   125 |  if (name_to_handle_at(AT_FDCWD, path, fhp, &mnt_id, 0) < 0) {
>       |      ^~~~~~~~~~~~~~~~~
> fs.c:109:7: warning: unused variable ?fh_buf? [-Wunused-variable]
>   109 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
>       |       ^~~~~~
> fs.c: In function ?get_cgroup2_path?:
> fs.c:172:21: error: invalid application of ?sizeof? to incomplete type
> ?struct file_handle?
>   172 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
>       |                     ^~~~~~
> fs.c:200:5: error: dereferencing pointer to incomplete type ?struct file_handle?
>   200 |  fhp->handle_bytes = sizeof(__u64);
>       |     ^~
> fs.c:204:7: warning: implicit declaration of function
> ?open_by_handle_at? [-Wimplicit-function-declaration]
>   204 |  fd = open_by_handle_at(mnt_fd, fhp, 0);
>       |       ^~~~~~~~~~~~~~~~~
> fs.c:172:7: warning: unused variable ?fh_buf? [-Wunused-variable]
>   172 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };

> Looks like your patch in uclibc [1] is not in the used version of the
> bootlin toolchain [2]. As far as I can see the toolchain uses uclibc
> v1.0.34.

> [1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=8bc41f131b8d70c84c300f14cd64abd448126b43
> [2] https://toolchains.bootlin.com/releases_armv5-eabi.html

> I think we have to wait until the toolchains will be updated to
> include uclibc version 1.0.36 or greater.
Yes.

We could just wrote patch, which check for name_to_handle_at() in configure and
use raw syscall for these old uClibc toolchains, send it to upstream (not sure
if it'd be accepted) and use it in Buildroot. But I've been busy with other
things, so I hope this won't be necessary.

Kind regards,
Petr

> Thank you

[Buildroot] [PATCH 1/1] package/iproute2: Bump version to 5.11.0

[Heiko Thiery]

Hi Petr,

Am Sa., 10. Apr. 2021 um 18:25 Uhr schrieb Petr Vorel <petr.vorel@gmail.com>:
>
> Hi Heiko,
>
> > Hi Petr, Hi Thomas,
>
> > Am So., 4. Apr. 2021 um 20:35 Uhr schrieb Petr Vorel <petr.vorel@gmail.com>:
>
> > > Hi Thomas,
> > > > Hello Petr,
>
> > > > On Tue, 23 Mar 2021 19:10:04 +0100
> > > > Petr Vorel <petr.vorel@gmail.com> wrote:
>
> > > > > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> > > > > ---
> > > > > Hi,
>
> > > > > NOTE: this should not be applied until uclibc based toolchains are
> > > > > regenerated. But posted for people who don't use uclibc and would like
> > > > > to have iproute2 sync with kernel version.
>
> > > > I think they have all been updated now. However, your patch doesn't
> > > > apply: it assumes that Buildroot master has iproute2 5.8.0, but we have
> > > > 5.7.0. And the patch we have in package/iproute2/ doesn't apply to
> > > > 5.11.0. Could you have a look and respin?
>
> > > Sure, I'll send fixed version, sorry for error.
>
> > > But I tried to build on updated package and it looks like error still exists.
> > > What do I do wrong?
>
> > I just tried to test the version bump of iproute2 to v5.11 and I see
> > the same/similar error on utils/pkg-test for
> > bootlin-armv5-uclibcbootlin-armv5-uclibc.
>
> >   109 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
> >       |                     ^~~~~~
> > fs.c:124:5: error: dereferencing pointer to incomplete type ?struct file_handle?
> >   124 |  fhp->handle_bytes = sizeof(__u64);
> >       |     ^~
> > fs.c:125:6: warning: implicit declaration of function
> > ?name_to_handle_at? [-Wimplicit-function-declaration]
> >   125 |  if (name_to_handle_at(AT_FDCWD, path, fhp, &mnt_id, 0) < 0) {
> >       |      ^~~~~~~~~~~~~~~~~
> > fs.c:109:7: warning: unused variable ?fh_buf? [-Wunused-variable]
> >   109 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
> >       |       ^~~~~~
> > fs.c: In function ?get_cgroup2_path?:
> > fs.c:172:21: error: invalid application of ?sizeof? to incomplete type
> > ?struct file_handle?
> >   172 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
> >       |                     ^~~~~~
> > fs.c:200:5: error: dereferencing pointer to incomplete type ?struct file_handle?
> >   200 |  fhp->handle_bytes = sizeof(__u64);
> >       |     ^~
> > fs.c:204:7: warning: implicit declaration of function
> > ?open_by_handle_at? [-Wimplicit-function-declaration]
> >   204 |  fd = open_by_handle_at(mnt_fd, fhp, 0);
> >       |       ^~~~~~~~~~~~~~~~~
> > fs.c:172:7: warning: unused variable ?fh_buf? [-Wunused-variable]
> >   172 |  char fh_buf[sizeof(struct file_handle) + sizeof(__u64)] = { 0 };
>
> > Looks like your patch in uclibc [1] is not in the used version of the
> > bootlin toolchain [2]. As far as I can see the toolchain uses uclibc
> > v1.0.34.
>
> > [1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=8bc41f131b8d70c84c300f14cd64abd448126b43
> > [2] https://toolchains.bootlin.com/releases_armv5-eabi.html
>
> > I think we have to wait until the toolchains will be updated to
> > include uclibc version 1.0.36 or greater.
> Yes.
>
> We could just wrote patch, which check for name_to_handle_at() in configure and
> use raw syscall for these old uClibc toolchains, send it to upstream (not sure
> if it'd be accepted) and use it in Buildroot. But I've been busy with other
> things, so I hope this won't be necessary.

Ok thank you for your answer. For me it is not necessary. I just
wanted to look at the patch and understand why it does not work. I'll
see if I can do something.

-- 
Heiko