[ptxdist] [PATCH 1/2] iproute2: add dependency to libcap

[ptxdist] [PATCH 1/2] iproute2: add dependency to libcap

[Roland Hieber]

From: Robert Schwebel <r.schwebel@pengutronix.de>

The handmade configure script in iproute2 doesn't correctly find libcap.
Enforce it to be there in any case.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/iproute2.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/iproute2.in b/rules/iproute2.in
index c28fd7da2a85..86e99b5b4f90 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -5,6 +5,7 @@ menuconfig IPROUTE2
 	prompt "iproute2                      "
 	select HOST_FLEX
 	select DB if IPROUTE2_ARPD
+	select LIBCAP
 	select LIBC_DL
 	select LIBC_M
 	select LIBC_RESOLV
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/2] iproute2: align conditionals

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/iproute2.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/iproute2.in b/rules/iproute2.in
index 86e99b5b4f90..6fa501fd51fb 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -4,15 +4,15 @@ menuconfig IPROUTE2
 	tristate
 	prompt "iproute2                      "
 	select HOST_FLEX
-	select DB if IPROUTE2_ARPD
+	select DB		if IPROUTE2_ARPD
 	select LIBCAP
 	select LIBC_DL
 	select LIBC_M
 	select LIBC_RESOLV
-	select LIBC_PTHREAD if IPROUTE2_ARPD
-	select GCCLIBS_GCC_S if IPROUTE2_IP || IPROUTE2_TC
-	select LIBSELINUX if GLOBAL_SELINUX
-	select LIBMNL if IPROUTE2_DEVLINK
+	select LIBC_PTHREAD	if IPROUTE2_ARPD
+	select GCCLIBS_GCC_S	if IPROUTE2_IP || IPROUTE2_TC
+	select LIBSELINUX	if GLOBAL_SELINUX
+	select LIBMNL		if IPROUTE2_DEVLINK
 	help
 	  Networking and traffic control tools
 
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2] iproute2: align select conditionals and sort by name

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 * v2: rebase after removing old patch 1/2

 rules/iproute2.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/iproute2.in b/rules/iproute2.in
index c28fd7da2a85..c089e7786b60 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -4,14 +4,14 @@ menuconfig IPROUTE2
 	tristate
 	prompt "iproute2                      "
 	select HOST_FLEX
-	select DB if IPROUTE2_ARPD
+	select DB		if IPROUTE2_ARPD
+	select GCCLIBS_GCC_S	if IPROUTE2_IP || IPROUTE2_TC
 	select LIBC_DL
 	select LIBC_M
+	select LIBC_PTHREAD	if IPROUTE2_ARPD
 	select LIBC_RESOLV
-	select LIBC_PTHREAD if IPROUTE2_ARPD
-	select GCCLIBS_GCC_S if IPROUTE2_IP || IPROUTE2_TC
-	select LIBSELINUX if GLOBAL_SELINUX
-	select LIBMNL if IPROUTE2_DEVLINK
+	select LIBMNL		if IPROUTE2_DEVLINK
+	select LIBSELINUX	if GLOBAL_SELINUX
 	help
 	  Networking and traffic control tools
 
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] iproute2: align select conditionals and sort by name

[Michael Olbrich]

Thanks, applied as 0458e24476dcf01d36659dab5e927c6e9b4e90ac.

Michael

[sent from post-receive hook]

On Tue, 06 Oct 2020 10:18:35 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200916100523.2151-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/iproute2.in b/rules/iproute2.in
> index c28fd7da2a85..c089e7786b60 100644
> --- a/rules/iproute2.in
> +++ b/rules/iproute2.in
> @@ -4,14 +4,14 @@ menuconfig IPROUTE2
>  	tristate
>  	prompt "iproute2                      "
>  	select HOST_FLEX
> -	select DB if IPROUTE2_ARPD
> +	select DB		if IPROUTE2_ARPD
> +	select GCCLIBS_GCC_S	if IPROUTE2_IP || IPROUTE2_TC
>  	select LIBC_DL
>  	select LIBC_M
> +	select LIBC_PTHREAD	if IPROUTE2_ARPD
>  	select LIBC_RESOLV
> -	select LIBC_PTHREAD if IPROUTE2_ARPD
> -	select GCCLIBS_GCC_S if IPROUTE2_IP || IPROUTE2_TC
> -	select LIBSELINUX if GLOBAL_SELINUX
> -	select LIBMNL if IPROUTE2_DEVLINK
> +	select LIBMNL		if IPROUTE2_DEVLINK
> +	select LIBSELINUX	if GLOBAL_SELINUX
>  	help
>  	  Networking and traffic control tools
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/2] iproute2: add dependency to libcap

[Michael Olbrich]

On Mon, Aug 31, 2020 at 11:15:55PM +0200, Roland Hieber wrote:
> From: Robert Schwebel <r.schwebel@pengutronix.de>
> 
> The handmade configure script in iproute2 doesn't correctly find libcap.
> Enforce it to be there in any case.

I don't see this here. The handmade configure script uses pkg-config. And
the check for libcap is blocked:

[...]
libcap support: arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'libcap': not selected by 'iproute2'
no
[...]

Michael

> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/iproute2.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/iproute2.in b/rules/iproute2.in
> index c28fd7da2a85..86e99b5b4f90 100644
> --- a/rules/iproute2.in
> +++ b/rules/iproute2.in
> @@ -5,6 +5,7 @@ menuconfig IPROUTE2
>  	prompt "iproute2                      "
>  	select HOST_FLEX
>  	select DB if IPROUTE2_ARPD
> +	select LIBCAP
>  	select LIBC_DL
>  	select LIBC_M
>  	select LIBC_RESOLV
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/2] iproute2: add dependency to libcap

[Roland Hieber]

On Fri, Sep 11, 2020 at 10:06:31AM +0200, Michael Olbrich wrote:
> On Mon, Aug 31, 2020 at 11:15:55PM +0200, Roland Hieber wrote:
> > From: Robert Schwebel <r.schwebel@pengutronix.de>
> > 
> > The handmade configure script in iproute2 doesn't correctly find libcap.
> > Enforce it to be there in any case.
> 
> I don't see this here. The handmade configure script uses pkg-config. And
> the check for libcap is blocked:
> 
> [...]
> libcap support: arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'libcap': not selected by 'iproute2'
> no
> [...]

Yes, we were seeing this too:

    libcap support: yes
    x86_64-unknown-linux-gnu-pkg-config: warning: blocking 'libcap': not selected by 'iproute2'
    x86_64-unknown-linux-gnu-pkg-config: warning: blocking 'libcap': not selected by 'iproute2'
    finished target iproute2.prepare

but then later: 

    /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: ../lib/libutil.a(utils.o): in function `drop_cap':
    utils.c:(.text+0x2972): undefined reference to `cap_get_proc'
    /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x2991): undefined reference to `cap_get_flag'
    /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x29a5): undefined reference to `cap_clear'
    /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x29b1): undefined reference to `cap_set_proc'
    /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x29bd): undefined reference to `cap_free'
    collect2: error: ld returned 1 exit status

If you want to investigate more, see
<http://jenkins.hi.pengutronix.de/job/ptxdist-bsps/job/DistroKit/job/next-x86_64/20/artifact/platform-x86_64/logfile/*view*/>
(internal PTX net only).

It could be related to libcap being installed on the build host, at
least the package doesn't fail to build on systems where it isn't
installed, and there is also no HAVE_LIBCAP in iproute2-5.7.0/config.mk.

 - Roland

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/2] iproute2: add dependency to libcap

[Michael Olbrich]

On Fri, Sep 11, 2020 at 10:18:18AM +0200, Roland Hieber wrote:
> On Fri, Sep 11, 2020 at 10:06:31AM +0200, Michael Olbrich wrote:
> > On Mon, Aug 31, 2020 at 11:15:55PM +0200, Roland Hieber wrote:
> > > From: Robert Schwebel <r.schwebel@pengutronix.de>
> > > 
> > > The handmade configure script in iproute2 doesn't correctly find libcap.
> > > Enforce it to be there in any case.
> > 
> > I don't see this here. The handmade configure script uses pkg-config. And
> > the check for libcap is blocked:
> > 
> > [...]
> > libcap support: arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'libcap': not selected by 'iproute2'
> > no
> > [...]
> 
> Yes, we were seeing this too:
> 
>     libcap support: yes
>     x86_64-unknown-linux-gnu-pkg-config: warning: blocking 'libcap': not selected by 'iproute2'
>     x86_64-unknown-linux-gnu-pkg-config: warning: blocking 'libcap': not selected by 'iproute2'
>     finished target iproute2.prepare
> 
> but then later: 
> 
>     /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: ../lib/libutil.a(utils.o): in function `drop_cap':
>     utils.c:(.text+0x2972): undefined reference to `cap_get_proc'
>     /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x2991): undefined reference to `cap_get_flag'
>     /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x29a5): undefined reference to `cap_clear'
>     /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x29b1): undefined reference to `cap_set_proc'
>     /opt/OSELAS.Toolchain-2020.08.0/x86_64-unknown-linux-gnu/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/x86_64-unknown-linux-gnu/10.2.1/../../../../x86_64-unknown-linux-gnu/bin/ld: utils.c:(.text+0x29bd): undefined reference to `cap_free'
>     collect2: error: ld returned 1 exit status
> 
> If you want to investigate more, see
> <http://jenkins.hi.pengutronix.de/job/ptxdist-bsps/job/DistroKit/job/next-x86_64/20/artifact/platform-x86_64/logfile/*view*/>
> (internal PTX net only).
> 
> It could be related to libcap being installed on the build host, at
> least the package doesn't fail to build on systems where it isn't
> installed, and there is also no HAVE_LIBCAP in iproute2-5.7.0/config.mk.

This is a race condition in our pkg-config wrapper. The libcap.pc shows up
right in the middle and the wrapper does not handle this correctly. I'm
working on a fix for this.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de