Skip to contentSkip to conversation

bpf: Remove redundant slash

PATCH Applied Yuntao Wang 4 participants 6 messages Mar 5, 2022 – Mar 8, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: Remove redundant slash

The trailing slash of LIBBPF_SRCS is redundant, remove it.

---
 kernel/bpf/preload/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/preload/Makefile +1 -1
index 167534e3b0b4..7b62b3e2bf6d 100644
@@ -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
Signature · 1 line
2.35.1
#1 lore raw

2022-03-06 00:10 UTC+0800 ~ Yuntao Wang <[email protected]>

Quoted 12 lines

The trailing slash of LIBBPF_SRCS is redundant, remove it.

---
 kernel/bpf/preload/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/preload/Makefile +0 -0
index 167534e3b0b4..7b62b3e2bf6d 100644

kernel/bpf/preload/Makefile line 6

Quoted 7 lines
kernel/bpf/preload/Makefile +1 -1
@@ -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

#2 lore raw

PATCH v2 1/1 bpf: Clean up Makefile of bpf preload

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.

---
v1->v2: get rid of LIBBPF_SRCS

 kernel/bpf/preload/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/bpf/preload/Makefile +1 -2
index 167534e3b0b4..7284782981bf 100644
@@ -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)
Signature · 1 line
2.35.1
#3 lore raw

Re: [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload

Quoted 11 lines · Yuntao Wang

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.

---
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.

Quoted 19 lines
 kernel/bpf/preload/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/bpf/preload/Makefile +1 -3
index 167534e3b0b4..7284782981bf 100644
@@ -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

#4 lore raw
In reply to Quentin Monnet
Quoted 20 lines · Quentin Monnet

2022-03-06 00:10 UTC+0800 ~ Yuntao Wang <[email protected]>

Quoted 18 lines

The trailing slash of LIBBPF_SRCS is redundant, remove it.

---
 kernel/bpf/preload/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/preload/Makefile +1 -1
index 167534e3b0b4..7b62b3e2bf6d 100644
@@ -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)/..
 
Quoted 6 lines

kernel/bpf/preload/Makefile line 6

Quoted 1 line
kernel/bpf/preload/Makefile +0 -0
 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.

Quoted 2 lines

Quentin

#5 lore raw
In reply to Yuntao Wang
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 6 lines · On Sun, 6 Mar 2022 00:10:13 +0800 you wrote:

The trailing slash of LIBBPF_SRCS is redundant, remove it.

---
 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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html