Skip to content

Commit

Permalink
CI, docs, contrib: remove libelf-dev from dependencies
Browse files Browse the repository at this point in the history
Since commit 4db3166 ("cilium-map-migrate: remove program and all
of its references") cilium-map-migrate has been replaced by a binary
written in Go and we no longer link binaries against libelf as of commit
c67cf7e ("bpf: remove libelf dependency and unused nobpf.h"). Thus,
drop libelf-dev from dependencies in CI and documentation.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
  • Loading branch information
tklauser authored and pchaigno committed Nov 10, 2021
1 parent 9a1086e commit 6a44107
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 12 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/lint-build-commits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ jobs:
directory: $HOME/.clang
cached: ${{ steps.cache-llvm.outputs.cache-hit }}

- name: Install libelf
run: |
sudo apt-get install libelf-dev
- name: Install ginkgo
run: |
go get github.com/onsi/ginkgo/ginkgo@v1.12.1
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ addons:
- kernel-package
- gnupg
- ipset
- libelf-dev
- libncurses5

before_install: ./.travis/prepare.sh
Expand Down
2 changes: 0 additions & 2 deletions Documentation/contributing/development/dev_setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ contribute to Cilium:
+--------------------------------------------------------------+------------------------------+--------------------------------------------------+
| llvm | >= 10.0 (latest recommended) | N/A (OS-specific) |
+--------------------------------------------------------------+------------------------------+--------------------------------------------------+
| libelf-devel | latest | N/A (OS-specific) |
+--------------------------------------------------------------+------------------------------+--------------------------------------------------+
| `go <https://golang.org/dl/>`_ | |GO_RELEASE| | N/A (OS-specific) |
+--------------------------------------------------------------+------------------------------+--------------------------------------------------+
+ `ginkgo <https://github.com/onsi/ginkgo>`__ | >= 1.4.0 | ``go get -u github.com/onsi/ginkgo/ginkgo`` |
Expand Down
1 change: 0 additions & 1 deletion contrib/ansible/roles/common/tasks/common_delete.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
- bc
- pkg-config
- libssl-dev
- libelf-dev
- bison
- flex
- libncurses5-dev
Expand Down
1 change: 0 additions & 1 deletion contrib/ansible/roles/common/tasks/common_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
- bc
- pkg-config
- libssl-dev
- libelf-dev
- bison
- flex
- libncurses5-dev
Expand Down
2 changes: 1 addition & 1 deletion contrib/packaging/rpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN curl -sSL -o /etc/yum.repos.d/vbatts-bazel-fedora-28.repo \
RUN dnf -y update && \
dnf -y install fedora-packager fedora-review golang gettext \
git glibc-devel.x86_64 cmake bazel libtool wget \
clang make gcc-c++ elfutils-libelf-devel libstdc++-static && \
clang make gcc-c++ libstdc++-static && \
mkdir -p /opt/cilium/

WORKDIR /opt/cilium
Expand Down
1 change: 0 additions & 1 deletion contrib/packaging/rpm/cilium.spec.envsubst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ BuildRequires: bazel
BuildRequires: ninja-build
BuildRequires: systemd
BuildRequires: gcc-c++
BuildRequires: elfutils-libelf-devel
BuildRequires: libstdc++-static
BuildRequires: libtool
BuildRequires: wget
Expand Down
1 change: 0 additions & 1 deletion tools/dev-doctor/rootcmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ func rootCmdRun(cmd *cobra.Command, args []string) {
versionRegexp: regexp.MustCompile(`github\.com/docker/buildx v(\d+\.\d+\.\d+)`),
hint: "see https://docs.docker.com/engine/install/",
},
// FIXME add libelf-devel check?
&binaryCheck{
name: "ginkgo",
ifNotFound: checkWarning,
Expand Down

0 comments on commit 6a44107

Please sign in to comment.