* [PATCH bpf-next] bpf: Remove redundant slash
@ 2022-03-05 16:10 Yuntao Wang
2022-03-07 17:06 ` Quentin Monnet
2022-03-08 6:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 6+ messages in thread
From: Yuntao Wang @ 2022-03-05 16:10 UTC (permalink / raw)
To: bpf
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Quentin Monnet, netdev, linux-kernel, Yuntao Wang
The trailing slash of LIBBPF_SRCS is redundant, remove it.
Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
---
kernel/bpf/preload/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/preload/Makefile b/kernel/bpf/preload/Makefile
index 167534e3b0b4..7b62b3e2bf6d 100644
--- a/kernel/bpf/preload/Makefile
+++ b/kernel/bpf/preload/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-LIBBPF_SRCS = $(srctree)/tools/lib/bpf/
+LIBBPF_SRCS = $(srctree)/tools/lib/bpf
LIBBPF_INCLUDE = $(LIBBPF_SRCS)/..
obj-$(CONFIG_BPF_PRELOAD_UMD) += bpf_preload.o
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next] bpf: Remove redundant slash
2022-03-05 16:10 [PATCH bpf-next] bpf: Remove redundant slash Yuntao Wang
@ 2022-03-07 17:06 ` Quentin Monnet
2022-03-08 4:43 ` [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload Yuntao Wang
2022-03-08 6:20 ` [PATCH bpf-next] bpf: Remove redundant slash Andrii Nakryiko
2022-03-08 6:30 ` patchwork-bot+netdevbpf
1 sibling, 2 replies; 6+ messages in thread
From: Quentin Monnet @ 2022-03-07 17:06 UTC (permalink / raw)
To: Yuntao Wang, bpf
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, netdev, linux-kernel
2022-03-06 00:10 UTC+0800 ~ Yuntao Wang <ytcoode@gmail.com>
> The trailing slash of LIBBPF_SRCS is redundant, remove it.
>
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
> kernel/bpf/preload/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/preload/Makefile b/kernel/bpf/preload/Makefile
> index 167534e3b0b4..7b62b3e2bf6d 100644
> --- a/kernel/bpf/preload/Makefile
> +++ b/kernel/bpf/preload/Makefile
> @@ -1,6 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0
>
> -LIBBPF_SRCS = $(srctree)/tools/lib/bpf/
> +LIBBPF_SRCS = $(srctree)/tools/lib/bpf
> LIBBPF_INCLUDE = $(LIBBPF_SRCS)/..
>
> obj-$(CONFIG_BPF_PRELOAD_UMD) += bpf_preload.o
Looks good to me, but we could maybe just as well get rid of LIBBPF_SRCS
in this file?:
LIBBPF_INCLUDE = $(srctree)/tools/lib
Quentin
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload
2022-03-07 17:06 ` Quentin Monnet
@ 2022-03-08 4:43 ` Yuntao Wang
2022-03-08 6:21 ` Andrii Nakryiko
2022-03-08 6:20 ` [PATCH bpf-next] bpf: Remove redundant slash Andrii Nakryiko
1 sibling, 1 reply; 6+ messages in thread
From: Yuntao Wang @ 2022-03-08 4:43 UTC (permalink / raw)
To: quentin
Cc: andrii, ast, bpf, daniel, john.fastabend, kafai, kpsingh,
linux-kernel, netdev, songliubraving, yhs, ytcoode
The trailing slash in LIBBPF_SRCS is redundant, it should be removed.
But to simplify the Makefile further, we can set LIBBPF_INCLUDE to
$(srctree)/tools/lib directly, thus the LIBBPF_SRCS variable is unused
and can be removed.
Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
---
v1->v2: get rid of LIBBPF_SRCS
kernel/bpf/preload/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/bpf/preload/Makefile b/kernel/bpf/preload/Makefile
index 167534e3b0b4..7284782981bf 100644
--- a/kernel/bpf/preload/Makefile
+++ b/kernel/bpf/preload/Makefile
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-LIBBPF_SRCS = $(srctree)/tools/lib/bpf/
-LIBBPF_INCLUDE = $(LIBBPF_SRCS)/..
+LIBBPF_INCLUDE = $(srctree)/tools/lib
obj-$(CONFIG_BPF_PRELOAD_UMD) += bpf_preload.o
CFLAGS_bpf_preload_kern.o += -I $(LIBBPF_INCLUDE)
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload
2022-03-08 4:43 ` [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload Yuntao Wang
@ 2022-03-08 6:21 ` Andrii Nakryiko
0 siblings, 0 replies; 6+ messages in thread
From: Andrii Nakryiko @ 2022-03-08 6:21 UTC (permalink / raw)
To: Yuntao Wang
Cc: Quentin Monnet, Andrii Nakryiko, Alexei Starovoitov, bpf,
Daniel Borkmann, john fastabend, Martin Lau, KP Singh, open list,
Networking, Song Liu, Yonghong Song
On Mon, Mar 7, 2022 at 8:45 PM Yuntao Wang <ytcoode@gmail.com> wrote:
>
> The trailing slash in LIBBPF_SRCS is redundant, it should be removed.
>
> But to simplify the Makefile further, we can set LIBBPF_INCLUDE to
> $(srctree)/tools/lib directly, thus the LIBBPF_SRCS variable is unused
> and can be removed.
>
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
> v1->v2: get rid of LIBBPF_SRCS
>
Oops, didn't notice v2. But I ended up pushing the same thing in your
v1, hope that's fine.
> kernel/bpf/preload/Makefile | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/kernel/bpf/preload/Makefile b/kernel/bpf/preload/Makefile
> index 167534e3b0b4..7284782981bf 100644
> --- a/kernel/bpf/preload/Makefile
> +++ b/kernel/bpf/preload/Makefile
> @@ -1,7 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0
>
> -LIBBPF_SRCS = $(srctree)/tools/lib/bpf/
> -LIBBPF_INCLUDE = $(LIBBPF_SRCS)/..
> +LIBBPF_INCLUDE = $(srctree)/tools/lib
>
> obj-$(CONFIG_BPF_PRELOAD_UMD) += bpf_preload.o
> CFLAGS_bpf_preload_kern.o += -I $(LIBBPF_INCLUDE)
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next] bpf: Remove redundant slash
2022-03-07 17:06 ` Quentin Monnet
2022-03-08 4:43 ` [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload Yuntao Wang
@ 2022-03-08 6:20 ` Andrii Nakryiko
1 sibling, 0 replies; 6+ messages in thread
From: Andrii Nakryiko @ 2022-03-08 6:20 UTC (permalink / raw)
To: Quentin Monnet
Cc: Yuntao Wang, bpf, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Networking, open list
On Mon, Mar 7, 2022 at 9:06 AM Quentin Monnet <quentin@isovalent.com> wrote:
>
> 2022-03-06 00:10 UTC+0800 ~ Yuntao Wang <ytcoode@gmail.com>
> > The trailing slash of LIBBPF_SRCS is redundant, remove it.
> >
> > Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> > ---
> > kernel/bpf/preload/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/kernel/bpf/preload/Makefile b/kernel/bpf/preload/Makefile
> > index 167534e3b0b4..7b62b3e2bf6d 100644
> > --- a/kernel/bpf/preload/Makefile
> > +++ b/kernel/bpf/preload/Makefile
> > @@ -1,6 +1,6 @@
> > # SPDX-License-Identifier: GPL-2.0
> >
> > -LIBBPF_SRCS = $(srctree)/tools/lib/bpf/
> > +LIBBPF_SRCS = $(srctree)/tools/lib/bpf
> > LIBBPF_INCLUDE = $(LIBBPF_SRCS)/..
> >
> > obj-$(CONFIG_BPF_PRELOAD_UMD) += bpf_preload.o
>
> Looks good to me, but we could maybe just as well get rid of LIBBPF_SRCS
> in this file?:
>
> LIBBPF_INCLUDE = $(srctree)/tools/lib
yep, I inlined this and ended up with just
LIBBPF_INCLUDE = $(srctree)/tools/lib
Applied to bpf-next, thanks.
>
> Quentin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next] bpf: Remove redundant slash
2022-03-05 16:10 [PATCH bpf-next] bpf: Remove redundant slash Yuntao Wang
2022-03-07 17:06 ` Quentin Monnet
@ 2022-03-08 6:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-03-08 6:30 UTC (permalink / raw)
To: Yuntao Wang
Cc: bpf, ast, daniel, andrii, kafai, songliubraving, yhs,
john.fastabend, kpsingh, quentin, netdev, linux-kernel
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:
On Sun, 6 Mar 2022 00:10:13 +0800 you wrote:
> The trailing slash of LIBBPF_SRCS is redundant, remove it.
>
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
> kernel/bpf/preload/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Here is the summary with links:
- [bpf-next] bpf: Remove redundant slash
https://git.kernel.org/bpf/bpf-next/c/4989135a8533
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-08 6:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-05 16:10 [PATCH bpf-next] bpf: Remove redundant slash Yuntao Wang
2022-03-07 17:06 ` Quentin Monnet
2022-03-08 4:43 ` [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload Yuntao Wang
2022-03-08 6:21 ` Andrii Nakryiko
2022-03-08 6:20 ` [PATCH bpf-next] bpf: Remove redundant slash Andrii Nakryiko
2022-03-08 6:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox