File 0105-ci-add-libnvme-dependency.patch of Package NetworkManager
From be4f7a94c6cdc0a4157ff1a5766ba4ca5b2a82e2 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Fri, 22 Nov 2024 16:49:47 +0100
Subject: [PATCH 105/106] ci: add libnvme dependency
Required for the nm-initrd-generator NBFT support.
Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
---
.gitlab-ci.yml | 10 +++++-----
contrib/alpine/REQUIRED_PACKAGES | 1 +
contrib/debian/REQUIRED_PACKAGES | 1 +
contrib/fedora/REQUIRED_PACKAGES | 1 +
contrib/fedora/rpm/NetworkManager.spec | 1 +
contrib/scripts/nm-ci-run.sh | 7 +++++++
tools/nm-in-container | 1 +
7 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3c36ed..b6acd6f 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-77ec3d923fd6'
- CENTOS_TAG: 'tag-7a677f4838e1'
- DEBIAN_TAG: 'tag-ecad19904683'
- FEDORA_TAG: 'tag-7a677f4838e1'
- UBUNTU_TAG: 'tag-ecad19904683'
+ ALPINE_TAG: 'tag-57edf560bf4f'
+ CENTOS_TAG: 'tag-7ea4f50c8578'
+ DEBIAN_TAG: 'tag-1601ce2572c5'
+ FEDORA_TAG: 'tag-7ea4f50c8578'
+ UBUNTU_TAG: 'tag-1601ce2572c5'
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 358214f..6f0e86f 100755
--- a/contrib/alpine/REQUIRED_PACKAGES
+++ b/contrib/alpine/REQUIRED_PACKAGES
@@ -24,6 +24,7 @@ apk add \
'jansson-dev' \
'libgudev-dev' \
'libndp-dev' \
+ 'libnvme-dev' \
'libnl3-dev' \
'libpsl-dev' \
'libsoup-dev' \
diff --git a/contrib/debian/REQUIRED_PACKAGES b/contrib/debian/REQUIRED_PACKAGES
index fa73b21..d91e54d 100755
--- a/contrib/debian/REQUIRED_PACKAGES
+++ b/contrib/debian/REQUIRED_PACKAGES
@@ -56,6 +56,7 @@ install \
libndp-dev \
libnewt-dev \
libnss3-dev \
+ libnvme-dev \
libpolkit-gobject-1-dev \
libpsl-dev \
libreadline-dev \
diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES
index 1bb7ec6..38a2cbb 100755
--- a/contrib/fedora/REQUIRED_PACKAGES
+++ b/contrib/fedora/REQUIRED_PACKAGES
@@ -66,6 +66,7 @@ install \
jq \
libcurl-devel \
libndp-devel \
+ libnvme-devel \
libselinux-devel \
libtool \
libuuid-devel \
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 2af0f44..b1117cd 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -307,6 +307,7 @@ BuildRequires: libubsan
BuildRequires: firewalld-filesystem
BuildRequires: iproute
BuildRequires: iproute-tc
+BuildRequires: libnvme-devel >= 1.5
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
diff --git a/contrib/scripts/nm-ci-run.sh b/contrib/scripts/nm-ci-run.sh
index 3864620..4881d11 100755
--- a/contrib/scripts/nm-ci-run.sh
+++ b/contrib/scripts/nm-ci-run.sh
@@ -54,10 +54,15 @@ _WITH_WERROR=1
_WITH_LIBTEAM="true"
_WITH_DOCS="true"
_WITH_SYSTEMD_LOGIND="true"
+_WITH_NBFT="true"
if [ $IS_ALPINE = 1 ]; then
_WITH_SYSTEMD_LOGIND="false"
fi
+if ! pkgconf 'libnvme >= 1.5'; then
+ _WITH_NBFT="false"
+fi
+
if [ -z "${NMTST_SEED_RAND+x}" ]; then
NMTST_SEED_RAND="$SRANDOM"
if [ -z "$NMTST_SEED_RAND" ]; then
@@ -181,6 +186,8 @@ meson setup build \
-D ifcfg_rh=false \
-D ifupdown=true \
\
+ -D nbft=$_WITH_NBFT \
+ \
#end
export NM_TEST_CLIENT_CHECK_L10N=1
diff --git a/tools/nm-in-container b/tools/nm-in-container
index 0e3f31d..365b8fc 100755
--- a/tools/nm-in-container
+++ b/tools/nm-in-container
@@ -224,6 +224,7 @@ RUN dnf install -y \\
libasan \\
libcurl-devel \\
libndp-devel \\
+ libnvme-devel \\
libpsl-devel \\
libselinux-devel \\
libtool \\
--
2.49.0
