| Message ID | 20230811152710.43564-3-flaniel@linux.microsoft.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Bump sysdig and falco libs | expand |
Francis, All, On 2023-08-11 17:27 +0200, Francis Laniel spake thusly: > Signed-off-by: Francis Laniel <flaniel@linux.microsoft.com> Ditto, please expand on the commit log. > --- > package/sysdig/sysdig.hash | 2 +- > package/sysdig/sysdig.mk | 9 +++++++-- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/package/sysdig/sysdig.hash b/package/sysdig/sysdig.hash > index cda3de5e7c..902f6f2b82 100644 > --- a/package/sysdig/sysdig.hash > +++ b/package/sysdig/sysdig.hash > @@ -1,3 +1,3 @@ > # sha256 locally computed > -sha256 6b96797859002ab69a2bed4fdba1c7fe8064ecf8661621ae7d8fbf8599ffa636 sysdig-0.29.3.tar.gz > +sha256 b8f43326506f85e99a3455f51b75ee79bf4db9dc12908ef43af672166274a795 sysdig-0.31.4.tar.gz > sha256 a88fbf820b38b1c7fabc6efe291b8259e02ae21326f56fe31c6c9adf374b2702 COPYING > diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk > index bafe534a16..fe725a8064 100644 > --- a/package/sysdig/sysdig.mk > +++ b/package/sysdig/sysdig.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SYSDIG_VERSION = 0.29.3 > +SYSDIG_VERSION = 0.31.4 > SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) > SYSDIG_LICENSE = Apache-2.0 > SYSDIG_LICENSE_FILES = COPYING > @@ -26,13 +26,18 @@ SYSDIG_DEPENDENCIES = \ > # grpc_cpp_plugin is needed to build falcosecurity libs, so we give the host > # one there. > SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR) \ > + -DDRIVER_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR)/driver \ Why do you need to peek into the source tree of falcsecurity-libs? And if you need the already built driver, then you need to peek into the build dir, nto the source dir. > -DBUILD_DRIVER=OFF \ > -DGRPC_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin \ > -DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME) \ > -DENABLE_DKMS=OFF \ > -DUSE_BUNDLED_DEPS=OFF \ > + -DUSE_BUNDLED_TBB=OFF \ > + -DUSE_BUNDLED_B64=OFF \ > + -DUSE_BUNDLED_JSONCPP=OFF \ > + -DUSE_BUNDLED_VALIJSON=OFF \ > + -DUSE_BUNDLED_RE2=OFF \ If the bundled copies are disabled, don't you instead need to add dependencies to the unbundled copies? I.e. SYSDIG_DPENDENCIES = \ [...] tbb \ libb64 \ jsoncpp \ valijson \ re2 > -DWITH_CHISEL=ON \ > - -DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson \ Urk, this was so wrong... There was no dependnecy to valijson, and the version is hard-coded so it has not been correct since 2022-10-22 when valijson was bumped to 0.7... Good that you get rid of it... Could you look into master and see at fixing it there? Regards, Yann E. MORIN. > -DSYSDIG_VERSION=$(SYSDIG_VERSION) > > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/sysdig/sysdig.hash b/package/sysdig/sysdig.hash index cda3de5e7c..902f6f2b82 100644 --- a/package/sysdig/sysdig.hash +++ b/package/sysdig/sysdig.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 6b96797859002ab69a2bed4fdba1c7fe8064ecf8661621ae7d8fbf8599ffa636 sysdig-0.29.3.tar.gz +sha256 b8f43326506f85e99a3455f51b75ee79bf4db9dc12908ef43af672166274a795 sysdig-0.31.4.tar.gz sha256 a88fbf820b38b1c7fabc6efe291b8259e02ae21326f56fe31c6c9adf374b2702 COPYING diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk index bafe534a16..fe725a8064 100644 --- a/package/sysdig/sysdig.mk +++ b/package/sysdig/sysdig.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSDIG_VERSION = 0.29.3 +SYSDIG_VERSION = 0.31.4 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) SYSDIG_LICENSE = Apache-2.0 SYSDIG_LICENSE_FILES = COPYING @@ -26,13 +26,18 @@ SYSDIG_DEPENDENCIES = \ # grpc_cpp_plugin is needed to build falcosecurity libs, so we give the host # one there. SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR) \ + -DDRIVER_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR)/driver \ -DBUILD_DRIVER=OFF \ -DGRPC_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin \ -DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME) \ -DENABLE_DKMS=OFF \ -DUSE_BUNDLED_DEPS=OFF \ + -DUSE_BUNDLED_TBB=OFF \ + -DUSE_BUNDLED_B64=OFF \ + -DUSE_BUNDLED_JSONCPP=OFF \ + -DUSE_BUNDLED_VALIJSON=OFF \ + -DUSE_BUNDLED_RE2=OFF \ -DWITH_CHISEL=ON \ - -DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson \ -DSYSDIG_VERSION=$(SYSDIG_VERSION) $(eval $(cmake-package))
Signed-off-by: Francis Laniel <flaniel@linux.microsoft.com> --- package/sysdig/sysdig.hash | 2 +- package/sysdig/sysdig.mk | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)