From ee461d0d178821471f5eccd0a0a25c2ca67ee6d3 Mon Sep 17 00:00:00 2001
From: Mauro Ezequiel Moltrasio <mmoltras@redhat.com>
Date: Thu, 13 Jul 2023 17:31:12 +0200
Subject: [PATCH] Adjust usage of bundled libbpf and fix bpf2go install

---
 bpfd/Dockerfile              |  2 +-
 falco-libs/Makefile          |  1 +
 falco-libs/compile-falco.sh  | 11 +++++++++--
 falco-libs/debian.Dockerfile |  1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bpfd/Dockerfile b/bpfd/Dockerfile
index 570d651..409ad49 100644
--- a/bpfd/Dockerfile
+++ b/bpfd/Dockerfile
@@ -28,7 +28,7 @@ RUN dnf config-manager --add-repo \
 
 RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 && \
 	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 && \
-	go install github.com/cilium/ebpf/cmd/bpf2go@master
+	go install github.com/cilium/ebpf/cmd/bpf2go@main
 
 RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | \
 	sh -s -- -y --no-modify-path && \
diff --git a/falco-libs/Makefile b/falco-libs/Makefile
index 55d7d49..13eadbf 100644
--- a/falco-libs/Makefile
+++ b/falco-libs/Makefile
@@ -29,6 +29,7 @@ docker-deploy: build docker-teardown
 		-e CMAKE_EXPORT_COMPILE_COMMANDS="ON" \
 		-e HOST_ROOT="/host" \
 		-e FALCO_DIR="${HOME}/go/src/github.com/falcosecurity/libs" \
+		-e FALCO_BUILDER_FLAVOR="${FALCO_BUILDER_FLAVOR}" \
 		-w ${HOME}/go/src/github.com/falcosecurity/libs \
 		-v ${HOME}/go/src/github.com/falcosecurity/libs:${HOME}/go/src/github.com/falcosecurity/libs \
 		-v /usr/src:/usr/src \
diff --git a/falco-libs/compile-falco.sh b/falco-libs/compile-falco.sh
index 776dd4b..2dda03b 100755
--- a/falco-libs/compile-falco.sh
+++ b/falco-libs/compile-falco.sh
@@ -14,7 +14,14 @@ function clean () {
 }
 
 function configure () {
-    sanitizers="-fsanitize=address -fsanitize=undefined"
+    # sanitizers="-fsanitize=address -fsanitize=undefined"
+    use_bundled_libbpf="OFF"
+
+    if [[ "${FALCO_BUILDER_FLAVOR:-fedora}" != "fedora" ]] ; then
+        # Platform dependent adjustments
+        use_bundled_libbpf="ON"
+    fi
+
     mkdir -p "${FALCO_DIR}/build"
     cmake \
         -DBUILD_BPF=ON \
@@ -22,7 +29,7 @@ function configure () {
         -DUSE_BUNDLED_VALIJSON=ON \
         -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_LIBSCAP_MODERN_BPF=ON \
-        -DUSE_BUNDLED_LIBBPF=OFF \
+        -DUSE_BUNDLED_LIBBPF="${use_bundled_libbpf}" \
         -DUSE_BUNDLED_ZLIB=ON \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
         -DCREATE_TEST_TARGETS=ON \
diff --git a/falco-libs/debian.Dockerfile b/falco-libs/debian.Dockerfile
index 947b584..72ef63e 100644
--- a/falco-libs/debian.Dockerfile
+++ b/falco-libs/debian.Dockerfile
@@ -35,6 +35,7 @@ RUN apt-get update && \
         linux-tools-"$(uname -r)" \
         libbpf-dev \
         libcap-dev \
+        vim \
         python3-pip && \
         apt-get clean && \
         rm -rf /var/lib/apt/lists/*