From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Sven Püschel" <s.pueschel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] nfsutils: version bump 2.8.4 -> 3.1.1
Date: Sat, 24 Oct 2026 09:16:27 +0200 [thread overview]
Message-ID: <20261024071628.2486185-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20261014133235.3531550-2-s.pueschel@pengutronix.de>
Thanks, applied as 92e5d135cbf74180e71659f2540d4efc234d80ac.
Michael
[sent from post-receive hook]
On Sat, 24 Oct 2026 09:16:27 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> 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 <s.pueschel@pengutronix.de>
> Message-Id: <20261014133235.3531550-2-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 000000000000..df8f3638af97
> --- /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?= <s.pueschel@pengutronix.de>
> +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 <s.pueschel@pengutronix.de>
> +---
> + 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 000000000000..9f8a4cb7ddcb
> --- /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 000000000000..6542b87befa6
> --- /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 aaab932b5a96..7856ec7f9dc8 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 fc58eafbc21f..d51b6bbf7ad8 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 63e2119283d7..80912fa34f7c 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 e4b7ffdea2e7..2a6ddac45b8d 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 \
next prev parent reply other threads:[~2026-10-24 7:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-14 13:32 [ptxdist] [PATCH 1/2] libnl3: add host package Sven Püschel
2026-10-14 13:32 ` [ptxdist] [PATCH 2/2] nfsutils: version bump 2.8.4 -> 3.1.1 Sven Püschel
2026-10-24 7:16 ` Michael Olbrich [this message]
2026-10-24 7:16 ` [ptxdist] [APPLIED] libnl3: add host package Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261024071628.2486185-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
--cc=s.pueschel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox