* [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid
@ 2021-07-16 21:01 Fabrice Fontaine
2021-07-16 21:06 ` Thomas Petazzoni
2021-07-18 10:21 ` Yann E. MORIN
0 siblings, 2 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2021-07-16 21:01 UTC (permalink / raw)
To: buildroot
Build of nfs-utils without uuid is broken since bump to version 2.5.4 in
commit 0ce30de72fb303768c5865949b8ce9260d0c43f5 because of
http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6
Fixes:
- http://autobuild.buildroot.org/results/510b3425943f2e31b024c99b3552419a80c2f9f3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/nfs-utils/Config.in | 2 ++
package/nfs-utils/nfs-utils.mk | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index b736f6c973..bd1e091331 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -7,6 +7,8 @@ config BR2_PACKAGE_NFS_UTILS
depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
The NFS Linux kernel server.
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index ab000e1ead..4e4cf93587 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -9,7 +9,7 @@ NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
NFS_UTILS_LICENSE = GPL-2.0+
NFS_UTILS_LICENSE_FILES = COPYING
-NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc
+NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc util-linux
NFS_UTILS_CPE_ID_VENDOR = linux-nfs
NFS_UTILS_AUTORECONF = YES
@@ -57,9 +57,8 @@ else
NFS_UTILS_CONF_OPTS += --disable-caps
endif
-ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
NFS_UTILS_CONF_OPTS += --enable-uuid
-NFS_UTILS_DEPENDENCIES += util-linux
else
NFS_UTILS_CONF_OPTS += --disable-uuid
endif
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid
2021-07-16 21:01 [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid Fabrice Fontaine
@ 2021-07-16 21:06 ` Thomas Petazzoni
2021-07-16 21:23 ` Fabrice Fontaine
2021-07-18 10:21 ` Yann E. MORIN
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2021-07-16 21:06 UTC (permalink / raw)
To: buildroot
On Fri, 16 Jul 2021 23:01:06 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Build of nfs-utils without uuid is broken since bump to version 2.5.4 in
> commit 0ce30de72fb303768c5865949b8ce9260d0c43f5 because of
> http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6
A bug should be reported upstream: the configure script should be
checking for the existence of libuuid, and not hardcode -luuid.
> -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
> +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
> NFS_UTILS_CONF_OPTS += --enable-uuid
Why do they still have a --enable-uuid / --disable-uuid option if uuid
is now mandatory anyway ?
It feels like the change from upstream is not quite complete :-/
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid
2021-07-16 21:06 ` Thomas Petazzoni
@ 2021-07-16 21:23 ` Fabrice Fontaine
2021-07-17 18:38 ` Petr Vorel
2021-07-17 18:54 ` Petr Vorel
0 siblings, 2 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2021-07-16 21:23 UTC (permalink / raw)
To: buildroot
Le ven. 16 juil. 2021 ? 23:06, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a ?crit :
>
> On Fri, 16 Jul 2021 23:01:06 +0200
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
> > Build of nfs-utils without uuid is broken since bump to version 2.5.4 in
> > commit 0ce30de72fb303768c5865949b8ce9260d0c43f5 because of
> > http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6
>
> A bug should be reported upstream: the configure script should be
> checking for the existence of libuuid, and not hardcode -luuid.
>
> > -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
> > +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
> > NFS_UTILS_CONF_OPTS += --enable-uuid
>
> Why do they still have a --enable-uuid / --disable-uuid option if uuid
> is now mandatory anyway ?
Despite its name, the "uuid" flag enables or disable blkid support:
168 AC_ARG_ENABLE(uuid,
169 [AC_HELP_STRING([--disable-uuid],
170 [Exclude uuid support to avoid buggy libblkid.
@<:@default=no@:>@])],
171 if test "$enableval" = "yes" ; then choose_blkid=yes;
else choose_blkid=no; fi,
172 choose_blkid=default)
403 if test "$choose_blkid" != no; then
404 AC_CHECK_LIB(blkid, blkid_get_library_version,
[LIBBLKID="-lblkid"], AC_MSG_ERROR([libblkid needed]))
405 AC_CHECK_HEADER(blkid/blkid.h, , AC_MSG_ERROR([Cannot find
libblkid header file blkid/blkid.h]))
406 AC_BLKID_VERS
407 if test $choose_blkid = yes; then
408 use_blkid=1
409 test $libblkid_cv_is_recent = no && AC_MSG_WARN([libblkid
is old and may cause mountd to leak memory])
410 else
411 if test $libblkid_cv_is_recent = yes
412 then use_blkid=1
413 else use_blkid=0
414 AC_MSG_WARN([uuid support disabled as libblkid is too old])
415 fi
416 fi
417 AC_DEFINE_UNQUOTED(USE_BLKID, $use_blkid, [Define if you want
to use blkid to find uuid of filesystems])
418 fi
>
> It feels like the change from upstream is not quite complete :-/
I'm not an expert of nfs-utils so I have no strong opinion but they
decided to hardcode -luuid for exportd and mountd and the commit
message seems to indicate that this change is intentional.
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,
Fabrice
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid
2021-07-16 21:23 ` Fabrice Fontaine
@ 2021-07-17 18:38 ` Petr Vorel
2021-07-17 18:54 ` Petr Vorel
1 sibling, 0 replies; 6+ messages in thread
From: Petr Vorel @ 2021-07-17 18:38 UTC (permalink / raw)
To: buildroot
Hi all,
[Cc Steve and Neil]
> Le ven. 16 juil. 2021 ? 23:06, Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> a ?crit :
> > On Fri, 16 Jul 2021 23:01:06 +0200
> > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> > > Build of nfs-utils without uuid is broken since bump to version 2.5.4 in
> > > commit 0ce30de72fb303768c5865949b8ce9260d0c43f5 because of
> > > http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6
> > A bug should be reported upstream: the configure script should be
> > checking for the existence of libuuid, and not hardcode -luuid.
> > > -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
> > > +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
> > > NFS_UTILS_CONF_OPTS += --enable-uuid
> > Why do they still have a --enable-uuid / --disable-uuid option if uuid
> > is now mandatory anyway ?
> Despite its name, the "uuid" flag enables or disable blkid support:
> 168 AC_ARG_ENABLE(uuid,
> 169 [AC_HELP_STRING([--disable-uuid],
> 170 [Exclude uuid support to avoid buggy libblkid.
> @<:@default=no@:>@])],
> 171 if test "$enableval" = "yes" ; then choose_blkid=yes;
> else choose_blkid=no; fi,
> 172 choose_blkid=default)
Yes I got confused by this as well. IMHO it'd be good to rename
--{enable,disable}-uuid to --{enable,disable}-blkid.
> 403 if test "$choose_blkid" != no; then
> 404 AC_CHECK_LIB(blkid, blkid_get_library_version,
> [LIBBLKID="-lblkid"], AC_MSG_ERROR([libblkid needed]))
> 405 AC_CHECK_HEADER(blkid/blkid.h, , AC_MSG_ERROR([Cannot find
> libblkid header file blkid/blkid.h]))
> 406 AC_BLKID_VERS
> 407 if test $choose_blkid = yes; then
> 408 use_blkid=1
> 409 test $libblkid_cv_is_recent = no && AC_MSG_WARN([libblkid
> is old and may cause mountd to leak memory])
> 410 else
> 411 if test $libblkid_cv_is_recent = yes
> 412 then use_blkid=1
> 413 else use_blkid=0
> 414 AC_MSG_WARN([uuid support disabled as libblkid is too old])
> 415 fi
> 416 fi
> 417 AC_DEFINE_UNQUOTED(USE_BLKID, $use_blkid, [Define if you want
> to use blkid to find uuid of filesystems])
> 418 fi
> > It feels like the change from upstream is not quite complete :-/
> I'm not an expert of nfs-utils so I have no strong opinion but they
> decided to hardcode -luuid for exportd and mountd and the commit
> message seems to indicate that this change is intentional.
That's how I understood it. IMHO buildroot should accept this fix.
@Steve: it might be worth next time to mention new dependency in release notes.
Kind regards,
Petr
> > Thomas
> > --
> > Thomas Petazzoni, co-owner and CEO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
> Best Regards,
> Fabrice
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid
2021-07-16 21:23 ` Fabrice Fontaine
2021-07-17 18:38 ` Petr Vorel
@ 2021-07-17 18:54 ` Petr Vorel
1 sibling, 0 replies; 6+ messages in thread
From: Petr Vorel @ 2021-07-17 18:54 UTC (permalink / raw)
To: buildroot
Hi Fabrice,
[Cc also James]
> Le ven. 16 juil. 2021 ? 23:06, Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> a ?crit :
> > On Fri, 16 Jul 2021 23:01:06 +0200
> > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> > > Build of nfs-utils without uuid is broken since bump to version 2.5.4 in
> > > commit 0ce30de72fb303768c5865949b8ce9260d0c43f5 because of
> > > http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6
> > A bug should be reported upstream: the configure script should be
> > checking for the existence of libuuid, and not hardcode -luuid.
> > > -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
> > > +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
> > > NFS_UTILS_CONF_OPTS += --enable-uuid
> > Why do they still have a --enable-uuid / --disable-uuid option if uuid
> > is now mandatory anyway ?
> Despite its name, the "uuid" flag enables or disable blkid support:
> 168 AC_ARG_ENABLE(uuid,
> 169 [AC_HELP_STRING([--disable-uuid],
> 170 [Exclude uuid support to avoid buggy libblkid.
> @<:@default=no@:>@])],
> 171 if test "$enableval" = "yes" ; then choose_blkid=yes;
> else choose_blkid=no; fi,
> 172 choose_blkid=default)
> 403 if test "$choose_blkid" != no; then
> 404 AC_CHECK_LIB(blkid, blkid_get_library_version,
> [LIBBLKID="-lblkid"], AC_MSG_ERROR([libblkid needed]))
> 405 AC_CHECK_HEADER(blkid/blkid.h, , AC_MSG_ERROR([Cannot find
> libblkid header file blkid/blkid.h]))
> 406 AC_BLKID_VERS
> 407 if test $choose_blkid = yes; then
> 408 use_blkid=1
> 409 test $libblkid_cv_is_recent = no && AC_MSG_WARN([libblkid
> is old and may cause mountd to leak memory])
> 410 else
> 411 if test $libblkid_cv_is_recent = yes
> 412 then use_blkid=1
> 413 else use_blkid=0
> 414 AC_MSG_WARN([uuid support disabled as libblkid is too old])
> 415 fi
> 416 fi
> 417 AC_DEFINE_UNQUOTED(USE_BLKID, $use_blkid, [Define if you want
> to use blkid to find uuid of filesystems])
> 418 fi
> > It feels like the change from upstream is not quite complete :-/
> I'm not an expert of nfs-utils so I have no strong opinion but they
> decided to hardcode -luuid for exportd and mountd and the commit
> message seems to indicate that this change is intentional.
> > Thomas
> > --
> > Thomas Petazzoni, co-owner and CEO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
> Best Regards,
> Fabrice
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Thanks for fixing this!
Kind regards,
Petr
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid
2021-07-16 21:01 [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid Fabrice Fontaine
2021-07-16 21:06 ` Thomas Petazzoni
@ 2021-07-18 10:21 ` Yann E. MORIN
1 sibling, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2021-07-18 10:21 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2021-07-16 23:01 +0200, Fabrice Fontaine spake thusly:
> Build of nfs-utils without uuid is broken since bump to version 2.5.4 in
> commit 0ce30de72fb303768c5865949b8ce9260d0c43f5 because of
> http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6
>
> Fixes:
> - http://autobuild.buildroot.org/results/510b3425943f2e31b024c99b3552419a80c2f9f3
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, after extending the commit log to explain the uuid
vs. libblkid situation, thanks.
Regards,
Yann E. MORIN.
> ---
> package/nfs-utils/Config.in | 2 ++
> package/nfs-utils/nfs-utils.mk | 5 ++---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
> index b736f6c973..bd1e091331 100644
> --- a/package/nfs-utils/Config.in
> +++ b/package/nfs-utils/Config.in
> @@ -7,6 +7,8 @@ config BR2_PACKAGE_NFS_UTILS
> depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind
> depends on BR2_USE_MMU # fork()
> select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc
> + select BR2_PACKAGE_UTIL_LINUX
> + select BR2_PACKAGE_UTIL_LINUX_LIBUUID
> help
> The NFS Linux kernel server.
>
> diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
> index ab000e1ead..4e4cf93587 100644
> --- a/package/nfs-utils/nfs-utils.mk
> +++ b/package/nfs-utils/nfs-utils.mk
> @@ -9,7 +9,7 @@ NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
> NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
> NFS_UTILS_LICENSE = GPL-2.0+
> NFS_UTILS_LICENSE_FILES = COPYING
> -NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc
> +NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc util-linux
> NFS_UTILS_CPE_ID_VENDOR = linux-nfs
> NFS_UTILS_AUTORECONF = YES
>
> @@ -57,9 +57,8 @@ else
> NFS_UTILS_CONF_OPTS += --disable-caps
> endif
>
> -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
> +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
> NFS_UTILS_CONF_OPTS += --enable-uuid
> -NFS_UTILS_DEPENDENCIES += util-linux
> else
> NFS_UTILS_CONF_OPTS += --disable-uuid
> endif
> --
> 2.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-18 10:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-16 21:01 [Buildroot] [PATCH 1/1] package/nfs-utils: needs uuid Fabrice Fontaine
2021-07-16 21:06 ` Thomas Petazzoni
2021-07-16 21:23 ` Fabrice Fontaine
2021-07-17 18:38 ` Petr Vorel
2021-07-17 18:54 ` Petr Vorel
2021-07-18 10:21 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox