Merge pull request #280 from Lyt99/fix/bpf

fix(bpf): fix bpf build for arm64
alibaba · May 18, 2024 · 15fa61a · 15fa61a
2 parents 1b4dae8 + 66a4342
commit 15fa61a
Show file tree

Hide file tree

Showing 62 changed files with 54 additions and 120,402 deletions.
diff --git a/Makefile b/Makefile
@@ -48,8 +48,9 @@ build-webconsole:
 
 .PHONY: generate-bpf
 generate-bpf:
-	go generate ./pkg/exporter/probe/...
+	TARGET=amd64 go generate ./pkg/exporter/probe/...
+	TARGET=arm64 go generate ./pkg/exporter/probe/...
 
 .PHONY: generate-bpf-in-container
 generate-bpf-in-container:
-	docker run -v $(PWD):/go/src/github.com/alibaba/kubeskoop --workdir /go/src/github.com/alibaba/kubeskoop kubeskoop/bpf-build:go121-clang17 go generate ./pkg/exporter/probe/...
+	docker run -v $(PWD):/go/src/github.com/alibaba/kubeskoop --workdir /go/src/github.com/alibaba/kubeskoop kubeskoop/bpf-build:go121-clang17 make generate-bpf
diff --git a/bpf/headers/vmlinux.h → bpf/headers/amd64/vmlinux.h b/bpf/headers/vmlinux.h → bpf/headers/amd64/vmlinux.h
diff --git a/bpf/headers/vmlinux-arm64.h → bpf/headers/arm64/vmlinux.h b/bpf/headers/vmlinux-arm64.h → bpf/headers/arm64/vmlinux.h