mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-22 13:30:30 +01:00
contrib: Add libbpf and libxdp to dependencies
Required for CLAT support
This commit is contained in:
parent
3f97b3b4bf
commit
b0674604ad
5 changed files with 18 additions and 5 deletions
|
|
@ -60,11 +60,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-722dacf5c4be'
|
||||
CENTOS_TAG: 'tag-1387a813d200'
|
||||
DEBIAN_TAG: 'tag-447ddf898453'
|
||||
FEDORA_TAG: 'tag-1387a813d200'
|
||||
UBUNTU_TAG: 'tag-447ddf898453'
|
||||
ALPINE_TAG: 'tag-12c17e10ea4f'
|
||||
CENTOS_TAG: 'tag-7ceaeb559370'
|
||||
DEBIAN_TAG: 'tag-2c43b8ac30c7'
|
||||
FEDORA_TAG: 'tag-7ceaeb559370'
|
||||
UBUNTU_TAG: 'tag-2c43b8ac30c7'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ apk add \
|
|||
'alpine-sdk' \
|
||||
'autoconf' \
|
||||
'bash' \
|
||||
'bpftool' \
|
||||
'clang' \
|
||||
'curl-dev' \
|
||||
'dbus' \
|
||||
|
|
@ -23,6 +24,7 @@ apk add \
|
|||
'iproute2' \
|
||||
'iptables' \
|
||||
'jansson-dev' \
|
||||
'libbpf-dev' \
|
||||
'libgudev-dev' \
|
||||
'libndp-dev' \
|
||||
'libnvme-dev' \
|
||||
|
|
@ -30,6 +32,7 @@ apk add \
|
|||
'libpsl-dev' \
|
||||
'libsoup-dev' \
|
||||
'libteam-dev' \
|
||||
'libxdp-dev' \
|
||||
'linux-headers' \
|
||||
'meson' \
|
||||
'mobile-broadband-provider-info' \
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ install_ignore_missing() {
|
|||
|
||||
install \
|
||||
\
|
||||
bpftool \
|
||||
clang \
|
||||
dbus \
|
||||
dbus-x11 \
|
||||
|
|
@ -43,6 +44,7 @@ install \
|
|||
iproute2 \
|
||||
iptables \
|
||||
libaudit-dev \
|
||||
libbpf-dev \
|
||||
libcurl4-gnutls-dev \
|
||||
libdbus-1-dev \
|
||||
libgirepository1.0-dev \
|
||||
|
|
@ -63,6 +65,7 @@ install \
|
|||
libsystemd-dev \
|
||||
libteam-dev \
|
||||
libudev-dev \
|
||||
libxdp-dev \
|
||||
locales \
|
||||
meson \
|
||||
mobile-broadband-provider-info \
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ install \
|
|||
ModemManager-glib-devel \
|
||||
audit-libs-devel \
|
||||
bluez-libs-devel \
|
||||
bpftool \
|
||||
clang \
|
||||
dbus-devel \
|
||||
dbus-x11 \
|
||||
|
|
@ -64,11 +65,13 @@ install \
|
|||
iptables \
|
||||
jansson-devel \
|
||||
jq \
|
||||
libbpf-devel \
|
||||
libcurl-devel \
|
||||
libndp-devel \
|
||||
libnvme-devel \
|
||||
libselinux-devel \
|
||||
libuuid-devel \
|
||||
libxdp-devel \
|
||||
meson \
|
||||
mobile-broadband-provider-info-devel \
|
||||
newt-devel \
|
||||
|
|
|
|||
|
|
@ -204,6 +204,7 @@ Requires(postun): systemd
|
|||
Requires: dbus >= %{dbus_version}
|
||||
Requires: glib2 >= %{glib2_version}
|
||||
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: libbpf
|
||||
|
||||
Recommends: iputils
|
||||
|
||||
|
|
@ -308,6 +309,9 @@ BuildRequires: firewalld-filesystem
|
|||
BuildRequires: iproute
|
||||
BuildRequires: iproute-tc
|
||||
BuildRequires: libnvme-devel >= 1.5
|
||||
BuildRequires: libbpf-devel
|
||||
BuildRequires: libxdp-devel
|
||||
BuildRequires: bpftool
|
||||
|
||||
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue