Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dependency for libxdp/libbpf #4234

Merged
merged 4 commits into from
Apr 10, 2024
Merged

update dependency for libxdp/libbpf #4234

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
008a89d
update dependency for libxdp/libbpf
ami-GS Apr 9, 2024
771719d
install v1.3.0 instead of v1.4.2 to avoid libc6 version conflic
ami-GS Apr 10, 2024
90066b7
add ubuntu20.04 specific deps
ami-GS Apr 10, 2024
f8e9ead
cleanup
ami-GS Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .docker/ubuntu-20.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
wget && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
apt-add-repository "deb http://mirrors.kernel.org/ubuntu noble main" -y && \
apt-add-repository ppa:lttng/stable-2.13 && \
apt-get update && apt-get install -y tzdata && apt-get install -y \
build-essential \
Expand All @@ -39,6 +40,17 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
cppcheck \
clang-tidy \
gdb \
libxdp-dev \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mentioned in our teams call today that some packages were old versions. Do these have the versions you need?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apt-add-repository "deb http://mirrors.kernel.org/ubuntu noble main"
I found this repository having 1.4.0. works on Ubuntu 22.04

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by default there is no libxdp package at all. there is only libbpf 0.5 or so (ubuntu 22.04)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xdp-tools seems to be not providing binary.
xdp-project/xdp-tools#416

libbpf-dev \
libnl-3-dev \
libnl-genl-3-dev \
libnl-route-3-dev \
zlib1g-dev \
zlib1g \
pkg-config \
m4 \
libpcap-dev \
libelf-dev \
&& rm -rf /var/lib/apt/lists/*

RUN gem install --version 2.8.1 dotenv
Expand Down
10 changes: 3 additions & 7 deletions .docker/ubuntu-22.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
wget && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main' && \
apt-add-repository "deb http://mirrors.kernel.org/ubuntu noble main" -y && \
apt-add-repository ppa:lttng/stable-2.13 && \
apt-get update && apt-get install -y tzdata && apt-get install -y \
build-essential \
Expand All @@ -39,6 +40,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
cppcheck \
clang-tidy \
gdb \
libxdp-dev \
libbpf-dev \
libnl-3-dev \
libnl-genl-3-dev \
libnl-route-3-dev \
Expand All @@ -48,7 +51,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
m4 \
libpcap-dev \
libelf-dev \
libc6-dev-i386 \
&& rm -rf /var/lib/apt/lists/*

RUN gem install fpm
Expand All @@ -62,12 +64,6 @@ RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsof
powershell \
&& rm -rf /var/lib/apt/lists/*

RUN wget -q https://github.com/libbpf/bpftool/releases/download/v7.2.0/bpftool-v7.2.0-amd64.tar.gz -O bpftool-amd64.tar.gz && \
tar xvzf bpftool-amd64.tar.gz && \
chmod +x ./bpftool && \
mv ./bpftool /usr/sbin/bpftool && \
rm -rf bpftool-amd64.tar.gz

RUN dpkg --add-architecture arm64
RUN dpkg --add-architecture armhf

Expand Down
Loading