From 29d06678fef648265ec00d27b68f90ea52fa10a5 Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Mon, 24 May 2021 16:12:17 +0200 Subject: [PATCH 1/2] build(docker/builder): `ncurses-dev` is not required anymore Since `libs` version 13ec67ebd23417273275296813066e07cb85bc91 Signed-off-by: Leonardo Grasso --- docker/builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index ea68f237e3f..f580288afa4 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -20,7 +20,7 @@ ENV FALCO_VERSION=${FALCO_VERSION} # build toolchain RUN yum -y install centos-release-scl && \ - INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel llvm-toolset-7 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel ncurses-devel rpm-build libyaml-devel" && \ + INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel llvm-toolset-7 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build libyaml-devel" && \ yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS From a97fc3fa24dd649a4c203fe54e7595c1b021aaad Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Mon, 24 May 2021 16:14:05 +0200 Subject: [PATCH 2/2] build(.circleci): `ncurses` is not required anymore Since `libs` version 13ec67ebd23417273275296813066e07cb85bc91 Signed-off-by: Leonardo Grasso --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9be76bbe39f..63d7a21a78e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: command: apk update - run: name: Install build dependencies - command: apk add g++ gcc cmake cmake make ncurses-dev git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils + command: apk add g++ gcc cmake cmake make git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils - run: name: Prepare project command: | @@ -60,7 +60,7 @@ jobs: command: apt update -y - run: name: Install dependencies - command: DEBIAN_FRONTEND=noninteractive apt install libjq-dev libncurses-dev libyaml-cpp-dev libelf-dev cmake build-essential git -y + command: DEBIAN_FRONTEND=noninteractive apt install libjq-dev libyaml-cpp-dev libelf-dev cmake build-essential git -y - run: name: Prepare project command: | @@ -92,7 +92,7 @@ jobs: command: apt update -y - run: name: Install dependencies - command: DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libncurses-dev libc-ares-dev libprotobuf-dev protobuf-compiler libjq-dev libyaml-cpp-dev libgrpc++-dev protobuf-compiler-grpc rpm libelf-dev cmake build-essential libcurl4-openssl-dev linux-headers-generic clang llvm git -y + command: DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libc-ares-dev libprotobuf-dev protobuf-compiler libjq-dev libyaml-cpp-dev libgrpc++-dev protobuf-compiler-grpc rpm libelf-dev cmake build-essential libcurl4-openssl-dev linux-headers-generic clang llvm git -y - run: name: Prepare project command: | @@ -124,7 +124,7 @@ jobs: command: apt update -y - run: name: Install dependencies - command: DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libncurses-dev libc-ares-dev libprotobuf-dev protobuf-compiler libjq-dev libyaml-cpp-dev libgrpc++-dev protobuf-compiler-grpc rpm libelf-dev cmake build-essential libcurl4-openssl-dev linux-headers-generic clang llvm git -y + command: DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libc-ares-dev libprotobuf-dev protobuf-compiler libjq-dev libyaml-cpp-dev libgrpc++-dev protobuf-compiler-grpc rpm libelf-dev cmake build-essential libcurl4-openssl-dev linux-headers-generic clang llvm git -y - run: name: Prepare project command: | @@ -156,7 +156,7 @@ jobs: command: apt update -y - run: name: Install dependencies - command: DEBIAN_FRONTEND=noninteractive apt install cmake build-essential clang llvm git linux-headers-generic libncurses-dev pkg-config autoconf libtool libelf-dev -y + command: DEBIAN_FRONTEND=noninteractive apt install cmake build-essential clang llvm git linux-headers-generic pkg-config autoconf libtool libelf-dev -y - run: name: Prepare project command: | @@ -188,7 +188,7 @@ jobs: command: dnf update -y - run: name: Install dependencies - command: dnf install gcc gcc-c++ git make cmake autoconf automake pkg-config patch ncurses-devel libtool elfutils-libelf-devel diffutils kernel-devel kernel-headers kernel-core clang llvm which -y + command: dnf install gcc gcc-c++ git make cmake autoconf automake pkg-config patch libtool elfutils-libelf-devel diffutils kernel-devel kernel-headers kernel-core clang llvm which -y - run: name: Prepare project command: |