Skip to content

Commit

Permalink
tracee-ebpf: move 3rdparty directory to root tree
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaeldtinoco authored and Rafael David Tinoco committed Dec 14, 2021
1 parent 3192676 commit fa38fc7
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "libbpf"]
path = tracee-ebpf/3rdparty/libbpf
url = https://github.com/libbpf/libbpf
path = 3rdparty/libbpf
url = git@github.com:libbpf/libbpf.git
File renamed without changes.
6 changes: 3 additions & 3 deletions Makefile.one
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ $(OUTPUT_DIR):
.PHONY: $(OUTPUT_DIR)/tracee.bpf
$(OUTPUT_DIR)/tracee.bpf:
$(CMD_MKDIR) -p $@
$(CMD_INSTALL) -m 0640 ./tracee-ebpf/3rdparty/include/* $@
$(CMD_INSTALL) -m 0640 ./3rdparty/include/* $@
$(CMD_INSTALL) -m 0640 $(OUTPUT_DIR)/libbpf/bpf/*.h $@
$(CMD_INSTALL) -m 0640 $(TRACEE_EBPF_OBJ_SRC) $@

Expand All @@ -217,7 +217,7 @@ $(OUTPUT_DIR)/tracee.bpf:

LIBBPF_CFLAGS =
LIBBPF_LDLAGS =
LIBBPF_SRC = ./tracee-ebpf/3rdparty/libbpf/src
LIBBPF_SRC = ./3rdparty/libbpf/src

$(OUTPUT_DIR)/libbpf/libbpf.a: $(LIBBPF_SRC) $(wildcard $(LIBBPF_SRC)/*.[ch]) | $(OUTPUT_DIR)
CC="$(CMD_CLANG)" \
Expand Down Expand Up @@ -301,7 +301,7 @@ clean-bpf-nocore:
# co-re ebpf
#

TRACEE_EBPF_OBJ_CORE_HEADERS = $(shell find tracee-ebpf -name *.h ! -iregex '.*3rdparty.*')
TRACEE_EBPF_OBJ_CORE_HEADERS = $(shell find tracee-ebpf -name *.h)

.PHONY: bpf-core
bpf-core: $(OUTPUT_DIR)/tracee.bpf.core.o
Expand Down
4 changes: 2 additions & 2 deletions tracee-ebpf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ OUT_BIN := $(OUT_DIR)/tracee-ebpf
BPF_SRC := tracee/tracee.bpf.c
OUT_BPF := $(OUT_DIR)/tracee.bpf.$(subst .,_,$(KERN_RELEASE)).$(subst .,_,$(VERSION)).o
OUT_BPF_CORE := $(OUT_DIR)/tracee.bpf.core.o
BPF_HEADERS := 3rdparty/include
BPF_HEADERS := ../3rdparty/include
BPF_BUNDLE := $(OUT_DIR)/tracee.bpf.tar.gz
LIBBPF_SRC := 3rdparty/libbpf/src
LIBBPF_SRC := ../3rdparty/libbpf/src
LIBBPF_HEADERS := $(OUT_DIR)/libbpf/usr/include
LIBBPF_OBJ := $(OUT_DIR)/libbpf/libbpf.a
OS_RELEASE_FILE := /etc/os-release
Expand Down

0 comments on commit fa38fc7

Please sign in to comment.