From 0202996587deea8621cfcb8ef9dbacdd733d716e Mon Sep 17 00:00:00 2001 From: Andrea Terzolo Date: Mon, 7 Nov 2022 22:04:42 +0100 Subject: [PATCH] chore: bump libs Signed-off-by: Andrea Terzolo --- .circleci/config.yml | 6 +++--- cmake/modules/driver.cmake | 4 ++-- cmake/modules/falcosecurity-libs.cmake | 4 ++-- docker/builder/centos7-builder.Dockerfile | 2 -- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb111553..0a805cc8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: name: Install deps ⛓️ command: | sudo apt update - sudo apt install -y --no-install-recommends ca-certificates cmake build-essential clang-14 git pkg-config autoconf automake libtool libelf-dev + sudo apt install -y --no-install-recommends ca-certificates cmake build-essential clang-14 git pkg-config autoconf automake libelf-dev sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 90 sudo update-alternatives --install /usr/bin/llvm-strip llvm-strip /usr/bin/llvm-strip-14 90 git clone https://github.com/libbpf/bpftool.git --branch v7.0.0 --single-branch @@ -69,7 +69,7 @@ jobs: command: | mkdir -p /build-static/release cd /build-static/release - cmake -DCPACK_GENERATOR=TGZ -DBUILD_BPF=Off -DBUILD_DRIVER=Off -DCMAKE_BUILD_TYPE=Release -DUSE_BUNDLED_DEPS=On -DMUSL_OPTIMIZED_BUILD=On -DFALCO_ETC_DIR=/etc/falco /source-static/falco + cmake -DCPACK_GENERATOR=TGZ -DBUILD_BPF=Off -DBUILD_DRIVER=Off -DCMAKE_BUILD_TYPE=Release -DUSE_BUNDLED_LIBELF=Off -DUSE_BUNDLED_DEPS=On -DMUSL_OPTIMIZED_BUILD=On -DFALCO_ETC_DIR=/etc/falco /source-static/falco - run: name: Build command: | @@ -110,7 +110,7 @@ jobs: name: Install deps ⛓️ command: | sudo apt update - sudo apt install -y --no-install-recommends ca-certificates cmake build-essential clang-14 git pkg-config autoconf automake libtool libelf-dev + sudo apt install -y --no-install-recommends ca-certificates cmake build-essential clang-14 git pkg-config autoconf automake libelf-dev sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 90 sudo update-alternatives --install /usr/bin/llvm-strip llvm-strip /usr/bin/llvm-strip-14 90 git clone https://github.com/libbpf/bpftool.git --branch v7.0.0 --single-branch diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake index 28b0c751..2cb8a306 100644 --- a/cmake/modules/driver.cmake +++ b/cmake/modules/driver.cmake @@ -26,8 +26,8 @@ else() # In case you want to test against another driver version (or branch, or commit) just pass the variable - # ie., `cmake -DDRIVER_VERSION=dev ..` if(NOT DRIVER_VERSION) - set(DRIVER_VERSION "7546d674df0a985ca1fc7a5bf9d7afae794a19fc") - set(DRIVER_CHECKSUM "SHA256=b55b4817f8ec0d7ce7f9fec031ad83edcb997bfe4d066a7f5361e6e72d541b81") + set(DRIVER_VERSION "bb9702d5d3d3358804b1d483e7648dc55a2b7826") + set(DRIVER_CHECKSUM "SHA256=447aa085ccedcd649e91f68aefff13d4ca2a9ddc0faa5c4e30dd76d45ae47267") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index 1631201a..259f915d 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -27,8 +27,8 @@ else() # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable - # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` if(NOT FALCOSECURITY_LIBS_VERSION) - set(FALCOSECURITY_LIBS_VERSION "7546d674df0a985ca1fc7a5bf9d7afae794a19fc") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=b55b4817f8ec0d7ce7f9fec031ad83edcb997bfe4d066a7f5361e6e72d541b81") + set(FALCOSECURITY_LIBS_VERSION "bb9702d5d3d3358804b1d483e7648dc55a2b7826") + set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=447aa085ccedcd649e91f68aefff13d4ca2a9ddc0faa5c4e30dd76d45ae47267") endif() # cd /path/to/build && cmake /path/to/source diff --git a/docker/builder/centos7-builder.Dockerfile b/docker/builder/centos7-builder.Dockerfile index 205b1670..2b4a0459 100644 --- a/docker/builder/centos7-builder.Dockerfile +++ b/docker/builder/centos7-builder.Dockerfile @@ -10,8 +10,6 @@ WORKDIR / RUN yum -y install centos-release-scl; \ yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++; \ source scl_source enable devtoolset-8; \ - # We can remove `elfutils-libelf-devel-static` and `xz` when the PR on libelf bundled is merged - yum install -y elfutils-libelf-devel-static xz; \ yum install -y git wget make m4 rpm-build # With some previous cmake versions it fails when downloading `zlib` with curl in the libs building phase