fix(modules): fix mod build for libs 0.14.x

Signed-off-by: Frederico Araujo <[email protected]>

Makefile

@@ -116,7 +116,7 @@ docker-base-build/musl:
 
 .PHONY: docker-mods-build
 docker-mods-build:
-	( DOCKER_BUILDKIT=1 docker build --secret id=rhuser,src=$(shell pwd)/scripts/build/rhuser --secret id=rhpassword,src=$(shell pwd)/scripts/build/rhpassword --build-arg ARCH=${ARCH} --build-arg MAKE_JOBS=${MAKE_JOBS} --build-arg UBI_VER=${UBI_VERSION} --target mods -t sysflowtelemetry/ubi:mods-${FALCO_LIBS_VERSION}-${FALCO_VERSION}-${UBI_VERSION} -f Dockerfile.ubi.amd64 . )
+	( DOCKER_BUILDKIT=1 docker build --build-arg ARCH=${ARCH} --secret id=rhuser,src=$(shell pwd)/scripts/build/rhuser --secret id=rhpassword,src=$(shell pwd)/scripts/build/rhpassword --build-arg MAKE_JOBS=${MAKE_JOBS} --build-arg UBI_VER=${UBI_VERSION} --target mods -t sysflowtelemetry/ubi:mods-${FALCO_LIBS_VERSION}-${FALCO_VERSION}-${UBI_VERSION} -f Dockerfile.ubi.amd64 . )
 
 .PHONY: docker-mods-build/musl
 docker-mods-build/musl:

makefile.manifest.inc

@@ -18,6 +18,7 @@
 
 SYSFLOW_VERSION?=0.7.0-rc1
 SYSFLOW_BUILD_NUMBER?=1
+<<<<<<< HEAD
 FALCO_VERSION=0.38.1
 FALCO_LIBS_VERSION=0.17.2
 FALCO_LIBS_DRIVER_VERSION=7.2.0+driver

modules/Makefile

@@ -96,14 +96,13 @@ falcolibs/package:
 			-DUSE_BUNDLED_DEPS=ON \
 			-DUSE_BUNDLED_LIBELF=OFF \
 			-DCREATE_TEST_TARGETS=OFF \
-			-DBUILD_LIBSCAP_EXAMPLES=OFF \
-			-DBUILD_LIBSINSP_EXAMPLES=OFF \
+			-DBUILD_LIBSCAP_EXAMPLES=ON \
+			-DBUILD_LIBSINSP_EXAMPLES=ON \
 			-DCMD_MAKE="make -j${MAKE_JOBS}" \
 			${MUSL_FLAG} ../. && make -j${MAKE_JOBS} && \
 	mkdir -p include && mkdir -p lib && mkdir -p bin && \
 	mkdir -p include/curl && cp curl-prefix/src/curl/include/curl/*.h include/curl && \
 	mkdir -p include/driver && cp driver/src/*h include/driver && cp ../driver/*h include/driver && \
-	mkdir -p include/userspace/common && cp ../userspace/common/*.h include/userspace/common && cp ../build/common/*.h include/userspace/common &&\
 	mkdir -p include/userspace/libsinsp && cp ../userspace/libsinsp/*.h include/userspace/libsinsp && \
 	mkdir -p include/userspace/libsinsp/container_engine && cp ../userspace/libsinsp/container_engine/*.h include/userspace/libsinsp/container_engine/ && \
 	mkdir -p include/userspace/libsinsp/filter && cp ../userspace/libsinsp/filter/*.h include/userspace/libsinsp/filter/ && \
@@ -123,8 +122,6 @@ falcolibs/package:
 	cp jsoncpp-prefix/src/lib/libjsoncpp.a lib/ && \
 	cp -r jsoncpp-prefix/src/include/json  include/ && \
 	cp -r c-ares-prefix/src/c-ares/target/include/*.h include/ && \
-	cp b64/base64.h include/ && \
-	cp -r jq-prefix/src/jq/target/include/*.h include/ && \
 	cp libpman/*.a lib/ && \
 	cp libsinsp/*.a lib/ && \
 	find libscap -name '*.a' -exec cp '{}' lib \; && \
@@ -138,7 +135,6 @@ falcolibs/package:
 	find grpc-prefix/src/grpc/third_party/abseil-cpp -name '*.a' -exec cp '{}' lib \; && \
 	cp c-ares-prefix/src/c-ares/target/lib/libcares.a lib/ && \
 	cp curl-prefix/src/curl/lib/.libs/libcurl.a lib/ && \
-	cp jq-prefix/src/jq/target/lib/*.a lib/ && \
 	cp openssl-prefix/src/openssl/target/lib/*.a lib/ && \
 	cp zlib-prefix/src/zlib/libz.a lib/libz.a
 ifeq ($(BUNDLE_FALCO_LIBS), 1)	

modules/falco-libs.s390x.mri

@@ -77,8 +77,6 @@ addlib libgrpc.a
 addlib libgrpc_plugin_support.a
 addlib libgrpc_unsecure.a
 addlib libgrpcpp_channelz.a
-addlib libjq.a
-addlib libonig.a
 addlib libscap.a
 addlib libscap_engine_bpf.a
 addlib libscap_engine_kmod.a
@@ -87,7 +85,6 @@ addlib libscap_engine_noop.a
 addlib libscap_engine_modern_bpf.a
 addlib libscap_engine_savefile.a
 addlib libscap_engine_source_plugin.a
-addlib libscap_engine_udig.a
 addlib libscap_engine_util.a
 addlib libscap_error.a
 addlib libscap_event_schema.a

modules/falco-libs.x86_64.mri

@@ -77,8 +77,6 @@ addlib libgrpc.a
 addlib libgrpc_plugin_support.a
 addlib libgrpc_unsecure.a
 addlib libgrpcpp_channelz.a
-addlib libjq.a
-addlib libonig.a
 addlib libscap.a
 addlib libscap_engine_bpf.a
 addlib libscap_engine_gvisor.a
@@ -88,7 +86,6 @@ addlib libscap_engine_noop.a
 addlib libscap_engine_modern_bpf.a
 addlib libscap_engine_savefile.a
 addlib libscap_engine_source_plugin.a
-addlib libscap_engine_udig.a
 addlib libscap_engine_util.a
 addlib libscap_error.a
 addlib libscap_event_schema.a