From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 14 Oct 2026 15:32:59 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xGz6J-00DW5K-2g for lore@lore.pengutronix.de; Wed, 14 Oct 2026 15:32:59 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xGz6J-0007QI-6k; Wed, 14 Oct 2026 15:32:59 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xGz5y-0007Gn-5S; Wed, 14 Oct 2026 15:32:38 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Wed, 14 Oct 2026 15:32:06 +0200 Message-ID: <20261014133235.3531550-2-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261014133235.3531550-1-s.pueschel@pengutronix.de> References: <20261014133235.3531550-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 2/2] nfsutils: version bump 2.8.4 -> 3.1.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false https://lore.kernel.org/linux-nfs/fdf3631f-e924-4e4c-bd9f-db5b40a90bfe@redhat.com/ https://lore.kernel.org/linux-nfs/4d58bf28-a3e0-4496-bae8-05387da27054@redhat.com/ https://lore.kernel.org/linux-nfs/4d11b9d7-7b49-4a1e-8c26-29ecb2fefe2f@redhat.com/ https://lore.kernel.org/linux-nfs/955a922e-c12d-435b-a698-caf73312f01d@redhat.com/ https://lore.kernel.org/linux-nfs/dc0f6f41-84be-4a70-92db-89890bded3ab@redhat.com/ https://lore.kernel.org/linux-nfs/5717a803-805c-409f-a9cc-d0c33a365570@redhat.com/ Since 2.9.1 libnl3 is now required unconditionally [1]. This also revealed a bug in the configure file, as the host package disables the nfsrahead option. [1] https://github.com/linux-nfs/nfs-utils/commit/d2fa3421f857e04de7f79cdf3114a0fe73983d25 Signed-off-by: Sven Püschel --- ...AS_IF-when-PKG_CHECK_MODULES-is-used.patch | 57 +++++++++++++++++++ patches/nfs-utils-3.1.1/autogen.sh | 1 + patches/nfs-utils-3.1.1/series | 4 ++ rules/host-nfsutils.in | 1 + rules/host-nfsutils.make | 2 +- rules/nfsutils.in | 1 + rules/nfsutils.make | 6 +- 7 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 patches/nfs-utils-3.1.1/0001-configure-use-AS_IF-when-PKG_CHECK_MODULES-is-used.patch create mode 120000 patches/nfs-utils-3.1.1/autogen.sh create mode 100644 patches/nfs-utils-3.1.1/series diff --git a/patches/nfs-utils-3.1.1/0001-configure-use-AS_IF-when-PKG_CHECK_MODULES-is-used.patch b/patches/nfs-utils-3.1.1/0001-configure-use-AS_IF-when-PKG_CHECK_MODULES-is-used.patch new file mode 100644 index 000000000..df8f3638a --- /dev/null +++ b/patches/nfs-utils-3.1.1/0001-configure-use-AS_IF-when-PKG_CHECK_MODULES-is-used.patch @@ -0,0 +1,57 @@ +From: =?UTF-8?q?Sven=20P=C3=BCschel?= +Date: Wed, 14 Oct 2026 12:31:16 +0200 +Subject: [PATCH] configure: use AS_IF when PKG_CHECK_MODULES is used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use AS_IF when PKG_CHECK_MODULES is used to avoid it's required macros +being expanded inside the test. Otherwise these required macros are not +available to subsequent PKG_CHECK_MODULES invocations, if the first +invocation is disabled, which therefore fails to find the package. + +Without this running `./configure --disable-nfsrahead` fails: + + checking for libnl-3.0 >= 3.1... no + configure: error: in '[redacted]/nfs-utils': + configure: error: A pkg-config implementation could not be found or + is too old. Make sure it is in your PATH or set the PKG_CONFIG + environment variable to the full path to pkg-config. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-nfs/20261014-fixconfigureasif-v1-1-0d2013f719e4@pengutronix.de/] +Signed-off-by: Sven Püschel +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 71ec1841d5b0..de6e63a49a9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -242,10 +242,10 @@ AC_ARG_ENABLE(nfsrahead, + enable_nfsrahead=$enableval, + enable_nfsrahead="yes") + AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ]) +- if test "$enable_nfsrahead" = yes; then ++ AS_IF([test "$enable_nfsrahead" = yes], [ + dnl Check for -lmount + PKG_CHECK_MODULES([LIBMOUNT], [mount]) +- fi ++ ]) + + AC_ARG_ENABLE(nfsdcltrack, + [AS_HELP_STRING([--enable-nfsdcltrack],[enable NFSv4 clientid tracking programs @<:@default=no@:>@])], +@@ -276,11 +276,11 @@ AC_ARG_ENABLE(nfsdctl, + enable_nfsdctl=$enableval, + enable_nfsdctl="yes") + AM_CONDITIONAL(CONFIG_NFSDCTL, [test "$enable_nfsdctl" = "yes" ]) +- if test "$enable_nfsdctl" = yes; then ++ AS_IF([test "$enable_nfsdctl" = yes], [ + AC_DEFINE([HAVE_NFSD_NETLINK], 1, + [Define to 1 if nfsd generic netlink support is available]) + PKG_CHECK_MODULES(LIBREADLINE, readline) +- fi ++ ]) + + AC_ARG_ENABLE(nfsv4server, + [AS_HELP_STRING([--enable-nfsv4server],[enable support for NFSv4 only server @<:@default=no@:>@])], diff --git a/patches/nfs-utils-3.1.1/autogen.sh b/patches/nfs-utils-3.1.1/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/nfs-utils-3.1.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/nfs-utils-3.1.1/series b/patches/nfs-utils-3.1.1/series new file mode 100644 index 000000000..6542b87be --- /dev/null +++ b/patches/nfs-utils-3.1.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure-use-AS_IF-when-PKG_CHECK_MODULES-is-used.patch +# 8fbef357cc873058f8bc0ef8a9bdc1c5 - git-ptx-patches magic diff --git a/rules/host-nfsutils.in b/rules/host-nfsutils.in index aaab932b5..7856ec7f9 100644 --- a/rules/host-nfsutils.in +++ b/rules/host-nfsutils.in @@ -4,4 +4,5 @@ config HOST_NFSUTILS tristate select HOST_LIBBLKID select HOST_LIBEVENT + select HOST_LIBNL3 default y if ALLYES diff --git a/rules/host-nfsutils.make b/rules/host-nfsutils.make index fc58eafbc..d51b6bbf7 100644 --- a/rules/host-nfsutils.make +++ b/rules/host-nfsutils.make @@ -31,7 +31,7 @@ HOST_NFSUTILS_CONF_TOOL := autoconf HOST_NFSUTILS_CONF_OPT := \ $(HOST_AUTOCONF) \ --disable-nfsv4 \ - --disable-nfsv41 \ + --disable-blkmapd \ --disable-gss \ --disable-svcgss \ --disable-kprefix \ diff --git a/rules/nfsutils.in b/rules/nfsutils.in index 63e211928..80912fa34 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -6,6 +6,7 @@ menuconfig NFSUTILS select GCCLIBS_GCC_S select LIBBLKID select LIBEVENT + select LIBNL3 select LIBTIRPC select UTIL_LINUX select UTIL_LINUX_LIBMOUNT diff --git a/rules/nfsutils.make b/rules/nfsutils.make index e4b7ffdea..2a6ddac45 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NFSUTILS) += nfsutils # # Paths and names # -NFSUTILS_VERSION := 2.8.4 -NFSUTILS_SHA256 := 50b6fa664eaed1710ae23c06ba449522a3a2b6509f88497a09a06f0dffc24181 +NFSUTILS_VERSION := 3.1.1 +NFSUTILS_SHA256 := 32f3bfde30d29b1858dc81bde687122c83151f783d34e34f9133220ce87ddf76 NFSUTILS := nfs-utils-$(NFSUTILS_VERSION) NFSUTILS_SUFFIX := tar.gz NFSUTILS_URL := $(call ptx/mirror, KERNEL, utils/nfs-utils/$(NFSUTILS_VERSION)/$(NFSUTILS).$(NFSUTILS_SUFFIX)) @@ -46,7 +46,7 @@ NFSUTILS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --exec-prefix=/usr \ --disable-nfsv4 \ - --disable-nfsv41 \ + --disable-blkmapd \ --disable-gss \ --disable-svcgss \ --disable-kprefix \ -- 2.47.3