diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67fcf0264e..dc8509071c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,11 +60,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - ALPINE_TAG: 'tag-0c3a6f855fb8' - CENTOS_TAG: 'tag-c1c23df75dda' - DEBIAN_TAG: 'tag-d4bf5db9e214' - FEDORA_TAG: 'tag-c1c23df75dda' - UBUNTU_TAG: 'tag-d4bf5db9e214' + ALPINE_TAG: 'tag-9048a8c683b9' + CENTOS_TAG: 'tag-026f017b5a4a' + DEBIAN_TAG: 'tag-27883e6c662f' + FEDORA_TAG: 'tag-026f017b5a4a' + UBUNTU_TAG: 'tag-27883e6c662f' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/contrib/alpine/REQUIRED_PACKAGES b/contrib/alpine/REQUIRED_PACKAGES index 3a3cc1abeb..a429c1c733 100755 --- a/contrib/alpine/REQUIRED_PACKAGES +++ b/contrib/alpine/REQUIRED_PACKAGES @@ -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' \ diff --git a/contrib/debian/REQUIRED_PACKAGES b/contrib/debian/REQUIRED_PACKAGES index 68f62570cc..a61ec0d184 100755 --- a/contrib/debian/REQUIRED_PACKAGES +++ b/contrib/debian/REQUIRED_PACKAGES @@ -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 \ diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 6f70537d40..6d37d8280f 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -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 \ diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 16081a10fc..6dcf3cc8c1 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -198,6 +198,7 @@ Requires(postun): systemd Requires: dbus >= %{dbus_version} Requires: glib2 >= %{glib2_version} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libbpf %if 0%{?rhel} == 8 # Older libndp versions use select() (rh#1933041). On well known distros, @@ -246,6 +247,7 @@ Conflicts: NetworkManager-dispatcher-routing-rules <= 1:1.47.5-3 %endif BuildRequires: gcc +BuildRequires: clang BuildRequires: pkgconfig BuildRequires: meson BuildRequires: gettext-devel >= 0.19.8 @@ -300,6 +302,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}