fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-26 00:40:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib: Add libbpf and libxdp to dependencies

Browse source 
Required for CLAT support
This commit is contained in:
Mary Strodl 2025-01-12 14:03:24 -05:00 • committed by Beniamino Galvani
parent 83317fed4e
commit dd3758dd80
5 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -60,11 +60,11 @@ variables:
# #
# This is done by running `ci-fairy generate-template` and possibly bumping # This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag". # ".default_tag".
ALPINE_TAG: 'tag-0c3a6f855fb8' ALPINE_TAG: 'tag-9048a8c683b9'
CENTOS_TAG: 'tag-c1c23df75dda' CENTOS_TAG: 'tag-026f017b5a4a'
DEBIAN_TAG: 'tag-d4bf5db9e214' DEBIAN_TAG: 'tag-27883e6c662f'
FEDORA_TAG: 'tag-c1c23df75dda' FEDORA_TAG: 'tag-026f017b5a4a'
UBUNTU_TAG: 'tag-d4bf5db9e214' UBUNTU_TAG: 'tag-27883e6c662f'
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'

3
contrib/alpine/REQUIRED_PACKAGES
View file

@ -8,6 +8,7 @@ apk add \
'alpine-sdk' \ 'alpine-sdk' \
'autoconf' \ 'autoconf' \
'bash' \ 'bash' \
'bpftool' \
'clang' \ 'clang' \
'curl-dev' \ 'curl-dev' \
'dbus' \ 'dbus' \
@ -23,6 +24,7 @@ apk add \
'iproute2' \ 'iproute2' \
'iptables' \ 'iptables' \
'jansson-dev' \ 'jansson-dev' \
'libbpf-dev' \
'libgudev-dev' \ 'libgudev-dev' \
'libndp-dev' \ 'libndp-dev' \
'libnvme-dev' \ 'libnvme-dev' \
@ -30,6 +32,7 @@ apk add \
'libpsl-dev' \ 'libpsl-dev' \
'libsoup-dev' \ 'libsoup-dev' \
'libteam-dev' \ 'libteam-dev' \
'libxdp-dev' \
'linux-headers' \ 'linux-headers' \
'meson' \ 'meson' \
'mobile-broadband-provider-info' \ 'mobile-broadband-provider-info' \

3
contrib/debian/REQUIRED_PACKAGES
View file

@ -32,6 +32,7 @@ install_ignore_missing() {
install \ install \
\ \
bpftool \
clang \ clang \
dbus \ dbus \
dbus-x11 \ dbus-x11 \
@ -43,6 +44,7 @@ install \
iproute2 \ iproute2 \
iptables \ iptables \
libaudit-dev \ libaudit-dev \
libbpf-dev \
libcurl4-gnutls-dev \ libcurl4-gnutls-dev \
libdbus-1-dev \ libdbus-1-dev \
libgirepository1.0-dev \ libgirepository1.0-dev \
@ -63,6 +65,7 @@ install \
libsystemd-dev \ libsystemd-dev \
libteam-dev \ libteam-dev \
libudev-dev \ libudev-dev \
libxdp-dev \
locales \ locales \
meson \ meson \
mobile-broadband-provider-info \ mobile-broadband-provider-info \

3
contrib/fedora/REQUIRED_PACKAGES
View file

@ -49,6 +49,7 @@ install \
ModemManager-glib-devel \ ModemManager-glib-devel \
audit-libs-devel \ audit-libs-devel \
bluez-libs-devel \ bluez-libs-devel \
bpftool \
clang \ clang \
dbus-devel \ dbus-devel \
dbus-x11 \ dbus-x11 \
@ -64,11 +65,13 @@ install \
iptables \ iptables \
jansson-devel \ jansson-devel \
jq \ jq \
libbpf-devel \
libcurl-devel \ libcurl-devel \
libndp-devel \ libndp-devel \
libnvme-devel \ libnvme-devel \
libselinux-devel \ libselinux-devel \
libuuid-devel \ libuuid-devel \
libxdp-devel \
meson \ meson \
mobile-broadband-provider-info-devel \ mobile-broadband-provider-info-devel \
newt-devel \ newt-devel \

5
contrib/fedora/rpm/NetworkManager.spec
View file

@ -182,6 +182,7 @@ Requires(postun): systemd
Requires: dbus >= %{dbus_version} Requires: dbus >= %{dbus_version}
Requires: glib2 >= %{glib2_version} Requires: glib2 >= %{glib2_version}
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libbpf
%if 0%{?rhel} == 8 %if 0%{?rhel} == 8
# Older libndp versions use select() (rh#1933041). On well known distros, # Older libndp versions use select() (rh#1933041). On well known distros,
@ -230,6 +231,7 @@ Conflicts: NetworkManager-dispatcher-routing-rules <= 1:1.47.5-3
%endif %endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: clang
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: meson BuildRequires: meson
BuildRequires: gettext-devel >= 0.19.8 BuildRequires: gettext-devel >= 0.19.8
@ -284,6 +286,9 @@ BuildRequires: firewalld-filesystem
BuildRequires: iproute BuildRequires: iproute
BuildRequires: iproute-tc BuildRequires: iproute-tc
BuildRequires: libnvme-devel >= 1.5 BuildRequires: libnvme-devel >= 1.5
BuildRequires: libbpf-devel
BuildRequires: libxdp-devel
BuildRequires: bpftool
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release} Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}