-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci/diffs: add a fix for BPF samples build
See https://lore.kernel.org/bpf/[email protected]/ Signed-off-by: Ihor Solodrai <[email protected]>
- Loading branch information
Showing
1 changed file
with
61 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
From 80a5958a52b86e39c1a1bf5f4702011c0cf6ab4f Mon Sep 17 00:00:00 2001 | ||
From: Eduard Zingerman <[email protected]> | ||
Date: Mon, 2 Dec 2024 12:14:46 -0800 | ||
Subject: [PATCH] samples/bpf: fix samples compilation | ||
|
||
Commit [0] breaks samples build. | ||
|
||
TODO: moar details here | ||
|
||
[0] 13b25489b6f8 ("kbuild: change working directory to external module directory with M=") | ||
|
||
Signed-off-by: Eduard Zingerman <[email protected]> | ||
Signed-off-by: Ihor Solodrai <[email protected]> | ||
--- | ||
samples/bpf/Makefile | 13 +++++++------ | ||
1 file changed, 7 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile | ||
index bcf103a4c14f..ee10dbf1b471 100644 | ||
--- a/samples/bpf/Makefile | ||
+++ b/samples/bpf/Makefile | ||
@@ -146,13 +146,14 @@ ifeq ($(ARCH), x86) | ||
BPF_EXTRA_CFLAGS += -fcf-protection | ||
endif | ||
|
||
-TPROGS_CFLAGS += -Wall -O2 | ||
-TPROGS_CFLAGS += -Wmissing-prototypes | ||
-TPROGS_CFLAGS += -Wstrict-prototypes | ||
-TPROGS_CFLAGS += $(call try-run,\ | ||
+COMMON_CFLAGS += -Wall -O2 | ||
+COMMON_CFLAGS += -Wmissing-prototypes | ||
+COMMON_CFLAGS += -Wstrict-prototypes | ||
+COMMON_CFLAGS += $(call try-run,\ | ||
printf "int main() { return 0; }" |\ | ||
$(CC) -Werror -fsanitize=bounds -x c - -o "$$TMP",-fsanitize=bounds,) | ||
|
||
+TPROGS_CFLAGS += $(COMMON_CFLAGS) | ||
TPROGS_CFLAGS += -I$(objtree)/usr/include | ||
TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ | ||
TPROGS_CFLAGS += -I$(LIBBPF_INCLUDE) | ||
@@ -229,7 +230,7 @@ clean: | ||
|
||
$(LIBBPF): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUTPUT) | ||
# Fix up variables inherited from Kbuild that tools/ build system won't like | ||
- $(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)" \ | ||
+ $(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(COMMON_CFLAGS)" \ | ||
LDFLAGS="$(TPROGS_LDFLAGS)" srctree=$(BPF_SAMPLES_PATH)/../../ \ | ||
O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= \ | ||
$@ install_headers | ||
@@ -305,7 +306,7 @@ $(obj)/$(TRACE_HELPERS): TPROGS_CFLAGS := $(TPROGS_CFLAGS) -D__must_check= | ||
-include $(BPF_SAMPLES_PATH)/Makefile.target | ||
|
||
VMLINUX_BTF_PATHS ?= $(abspath $(if $(O),$(O)/vmlinux)) \ | ||
- $(abspath $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux)) \ | ||
+ $(abspath $(if $(objtree),$(objtree)/vmlinux)) \ | ||
$(abspath ./vmlinux) | ||
VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) | ||
|
||
-- | ||
2.47.0 | ||
|