Skip to content

Commit 8869c07

Browse files
ekoopspoiana
authored andcommitted
chore: drop clang and llvm
Clang and llvm were required to build the legacy eBPF probe. Since 024c972 removed any support for building it, remove also anything installing the corresponding compilation toolchain. Signed-off-by: Leonardo Di Giovanna <leonardodigiovanna1@gmail.com>
1 parent 024c972 commit 8869c07

13 files changed

+7
-27
lines changed

Example_configs.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,7 @@ ARG rh_password
233233
234234
RUN subscription-manager register --username $rh_username --password $rh_password --auto-attach
235235
236-
RUN yum install gcc curl elfutils-libelf-devel kmod make \
237-
llvm-toolset-0:12.0.1-1.module+el8.5.0+11871+08d0eab5.x86_64 cpio -y
236+
RUN yum install gcc curl elfutils-libelf-devel kmod make cpio -y
238237
```
239238

240239
## redhat 9
@@ -257,7 +256,7 @@ and Dockerfile.rhel9:
257256
```bash
258257
FROM docker.io/redhat/ubi9
259258

260-
RUN yum install gcc elfutils-libelf-devel kmod make cpio llvm-toolset -y
259+
RUN yum install gcc elfutils-libelf-devel kmod make cpio -y
261260
RUN ln -s /usr/bin/$(uname -p)-redhat-linux-gcc-11 /usr/bin/gcc-11
262261
```
263262
The `ln -s /usr/bin/$(uname -p)-redhat-linux-gcc-11 /usr/bin/gcc-11` command creates a symbolic link which makes sure driverkit finds the correct compiler binary.
@@ -276,7 +275,7 @@ ARG REDHAT_PASSWORD
276275

277276
RUN subscription-manager register --username $REDHAT_USERNAME --password $REDHAT_PASSWORD --auto-attach
278277

279-
RUN yum install gcc elfutils-libelf-devel kmod make cpio llvm-toolset -y
278+
RUN yum install gcc elfutils-libelf-devel kmod make cpio -y
280279
RUN ln -s /usr/bin/$(uname -p)-redhat-linux-gcc-11 /usr/bin/gcc-11
281280
```
282281

cmd/local.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func NewLocalCmd(configOpts *ConfigOptions, rootOpts *RootOptions, rootFlags *pf
2020
opts := localCmdOptions{}
2121
localCmd := &cobra.Command{
2222
Use: "local",
23-
Short: "Build Falco kernel modules in local env with local kernel sources and gcc/clang.",
23+
Short: "Build Falco kernel modules in local env with local kernel sources and gcc.",
2424
RunE: func(c *cobra.Command, args []string) error {
2525
configOpts.Printer.Logger.Info("starting build",
2626
configOpts.Printer.Logger.Args("processor", c.Name()))

cmd/testdata/templates/commands.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Available Commands:
55
images List builder images
66
kubernetes Build Falco kernel modules against a Kubernetes cluster.
77
kubernetes-in-cluster Build Falco kernel modules against a Kubernetes cluster inside a Kubernetes cluster.
8-
local Build Falco kernel modules in local env with local kernel sources and gcc/clang.
8+
local Build Falco kernel modules in local env with local kernel sources and gcc.

docker/builders/builder-amazonlinux2-x86_64_gcc10.0.0.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ LABEL maintainer="cncf-falco-dev@lists.cncf.io"
66
ARG CMAKE_VERSION
77

88
RUN yum -y install gcc10 \
9-
clang \
10-
llvm \
119
bash-completion \
1210
bc \
1311
ca-certificates \

docker/builders/builder-any-x86_64_gcc10.0.0_gcc9.0.0.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ RUN apt-get update \
1212
&& apt-get install -y --no-install-recommends \
1313
bash-completion \
1414
bc \
15-
clang \
16-
llvm \
1715
ca-certificates \
1816
curl \
1917
dkms \

docker/builders/builder-any-x86_64_gcc12.0.0_gcc11.0.0.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ RUN apt-get update \
1212
&& apt-get install -y --no-install-recommends \
1313
bash-completion \
1414
bc \
15-
clang \
16-
llvm \
1715
ca-certificates \
1816
curl \
1917
dkms \

docker/builders/builder-any-x86_64_gcc13.0.0.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ ARG CMAKE_VERSION
99
RUN dnf install -y \
1010
bash-completion \
1111
bc \
12-
clang \
13-
llvm \
1412
ca-certificates \
1513
curl \
1614
dkms \

docker/builders/builder-any-x86_64_gcc14.0.0.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ ARG CMAKE_VERSION
99
RUN dnf install -y \
1010
bash-completion \
1111
bc \
12-
clang \
13-
llvm \
1412
ca-certificates \
1513
curl \
1614
dkms \

docker/builders/builder-any-x86_64_gcc8.0.0_gcc6.0.0_gcc5.0.0_gcc4.9.0_gcc4.8.0.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ RUN apt-get update \
1919
&& apt-get install -y --no-install-recommends \
2020
bash-completion \
2121
bc \
22-
clang \
23-
llvm \
2422
ca-certificates \
2523
curl \
2624
dkms \

docker/builders/builder-centos-x86_64_gcc4.8.5.Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo; \
1818
sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo
1919

2020
RUN yum -y install gcc \
21-
llvm-toolset-7.0 \
2221
bash-completion \
2322
bc \
2423
ca-certificates \
@@ -47,7 +46,3 @@ RUN curl -L -o /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/downl
4746

4847
# Properly create soft link
4948
RUN ln -s /usr/bin/gcc /usr/bin/gcc-4.8.5
50-
51-
RUN source scl_source enable llvm-toolset-7.0
52-
RUN echo "source scl_source enable llvm-toolset-7.0" >> /etc/bashrc
53-
RUN source /etc/bashrc

0 commit comments

Comments
 (0)