diff mbox series

[SRU,Kinetic,Unstable] UBUNTU: [Config] Disable selftests/net/bpf/nat6to4

Message ID 20221114211857.957056-1-kamal@canonical.com
State New
Headers show
Series [SRU,Kinetic,Unstable] UBUNTU: [Config] Disable selftests/net/bpf/nat6to4 | expand

Commit Message

Kamal Mostafa Nov. 14, 2022, 9:18 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1996536

This mainline bpf selftest (nat6to4) requires additional package
dependencies not satisfied by the Ubuntu kernel Build-depends and
unsatisfiable when cross compilers are installed.  Disable it to allow
the rest of selftests/ to build.

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 tools/testing/selftests/net/bpf/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Andrea Righi Nov. 14, 2022, 10:07 p.m. UTC | #1
On Mon, Nov 14, 2022 at 01:18:57PM -0800, Kamal Mostafa wrote:
> BugLink: https://bugs.launchpad.net/bugs/1996536
> 
> This mainline bpf selftest (nat6to4) requires additional package
> dependencies not satisfied by the Ubuntu kernel Build-depends and
> unsatisfiable when cross compilers are installed.  Disable it to allow
> the rest of selftests/ to build.
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>

Makes sense to me. BTW, I've sent a (partial) fix upstream:
https://lore.kernel.org/lkml/20221114203431.302655-1-andrea.righi@canonical.com/

But in addition to that we also need to install gcc-multilib (and maybe
other stuff). I think we don't want to deal with a lot of other
potential dependencies just to build this test, so it probably makes
sense to disable it for now.

Just one comment on the subject, I think it should be "UBUNTU: SAUCE",
instead of "UBUNTU: [Config]", because we're touching kernel code and
not stuff that are affecting the .config.

Apart from that:
Acked-by: Andrea Righi <andrea.righi@canonical.com>

> ---
>  tools/testing/selftests/net/bpf/Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
> index 8ccaf8732eb2..7d8eddd327b7 100644
> --- a/tools/testing/selftests/net/bpf/Makefile
> +++ b/tools/testing/selftests/net/bpf/Makefile
> @@ -5,7 +5,8 @@ CCINCLUDE += -I../../bpf
>  CCINCLUDE += -I../../../../lib
>  CCINCLUDE += -I../../../../../usr/include/
>  
> -TEST_CUSTOM_PROGS = $(OUTPUT)/bpf/nat6to4.o
> +TEST_CUSTOM_PROGS = \
> +	# $(OUTPUT)/bpf/nat6to4.o # Disabled for Ubuntu selftests build
>  all: $(TEST_CUSTOM_PROGS)
>  
>  $(OUTPUT)/%.o: %.c
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Tim Gardner Nov. 15, 2022, 2:06 p.m. UTC | #2
On 11/14/22 2:18 PM, Kamal Mostafa wrote:
> BugLink: https://bugs.launchpad.net/bugs/1996536
> 
> This mainline bpf selftest (nat6to4) requires additional package
> dependencies not satisfied by the Ubuntu kernel Build-depends and
> unsatisfiable when cross compilers are installed.  Disable it to allow
> the rest of selftests/ to build.
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---
>   tools/testing/selftests/net/bpf/Makefile | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
> index 8ccaf8732eb2..7d8eddd327b7 100644
> --- a/tools/testing/selftests/net/bpf/Makefile
> +++ b/tools/testing/selftests/net/bpf/Makefile
> @@ -5,7 +5,8 @@ CCINCLUDE += -I../../bpf
>   CCINCLUDE += -I../../../../lib
>   CCINCLUDE += -I../../../../../usr/include/
>   
> -TEST_CUSTOM_PROGS = $(OUTPUT)/bpf/nat6to4.o
> +TEST_CUSTOM_PROGS = \
> +	# $(OUTPUT)/bpf/nat6to4.o # Disabled for Ubuntu selftests build
>   all: $(TEST_CUSTOM_PROGS)
>   
>   $(OUTPUT)/%.o: %.c
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Paolo Pisati Nov. 17, 2022, 4:43 p.m. UTC | #3
On Mon, Nov 14, 2022 at 01:18:57PM -0800, Kamal Mostafa wrote:
> BugLink: https://bugs.launchpad.net/bugs/1996536
> 
> This mainline bpf selftest (nat6to4) requires additional package
> dependencies not satisfied by the Ubuntu kernel Build-depends and
> unsatisfiable when cross compilers are installed.  Disable it to allow
> the rest of selftests/ to build.
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Stefan Bader Nov. 23, 2022, 9:01 a.m. UTC | #4
On 14.11.22 22:18, Kamal Mostafa wrote:
> BugLink: https://bugs.launchpad.net/bugs/1996536
> 
> This mainline bpf selftest (nat6to4) requires additional package
> dependencies not satisfied by the Ubuntu kernel Build-depends and
> unsatisfiable when cross compilers are installed.  Disable it to allow
> the rest of selftests/ to build.
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---

Applied to kinetic:linux/master-next. Thanks.

-Stefan

>   tools/testing/selftests/net/bpf/Makefile | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
> index 8ccaf8732eb2..7d8eddd327b7 100644
> --- a/tools/testing/selftests/net/bpf/Makefile
> +++ b/tools/testing/selftests/net/bpf/Makefile
> @@ -5,7 +5,8 @@ CCINCLUDE += -I../../bpf
>   CCINCLUDE += -I../../../../lib
>   CCINCLUDE += -I../../../../../usr/include/
>   
> -TEST_CUSTOM_PROGS = $(OUTPUT)/bpf/nat6to4.o
> +TEST_CUSTOM_PROGS = \
> +	# $(OUTPUT)/bpf/nat6to4.o # Disabled for Ubuntu selftests build
>   all: $(TEST_CUSTOM_PROGS)
>   
>   $(OUTPUT)/%.o: %.c
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
index 8ccaf8732eb2..7d8eddd327b7 100644
--- a/tools/testing/selftests/net/bpf/Makefile
+++ b/tools/testing/selftests/net/bpf/Makefile
@@ -5,7 +5,8 @@  CCINCLUDE += -I../../bpf
 CCINCLUDE += -I../../../../lib
 CCINCLUDE += -I../../../../../usr/include/
 
-TEST_CUSTOM_PROGS = $(OUTPUT)/bpf/nat6to4.o
+TEST_CUSTOM_PROGS = \
+	# $(OUTPUT)/bpf/nat6to4.o # Disabled for Ubuntu selftests build
 all: $(TEST_CUSTOM_PROGS)
 
 $(OUTPUT)/%.o: %.c