[Buildroot] [PATCH v2 1/3] package/nfs-utils: enable nfsv4/nfsv4.1 support

[Buildroot] [PATCH v2 1/3] package/nfs-utils: enable nfsv4/nfsv4.1 support

[James Hilliard]

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/nfs-utils/Config.in    | 10 ++++++++++
 package/nfs-utils/nfs-utils.mk |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index da563db0f1..b736f6c973 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -14,6 +14,16 @@ config BR2_PACKAGE_NFS_UTILS
 
 if BR2_PACKAGE_NFS_UTILS
 
+config BR2_PACKAGE_NFS_UTILS_NFSV4
+	bool "NFSv4/NFSv4.1"
+	depends on !BR2_STATIC_LIBS # keyutils, lvm2
+	select BR2_PACKAGE_KEYUTILS
+	select BR2_PACKAGE_LIBEVENT
+	select BR2_PACKAGE_LVM2
+	select BR2_PACKAGE_SQLITE
+	help
+	  Enable NFSv4/NFSv4.1 support
+
 config BR2_PACKAGE_NFS_UTILS_RPCDEBUG
 	bool "rpcdebug"
 	help
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index c384e939d8..2598f0908b 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -16,8 +16,6 @@ NFS_UTILS_AUTORECONF = YES
 NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
 
 NFS_UTILS_CONF_OPTS = \
-	--disable-nfsv4 \
-	--disable-nfsv41 \
 	--disable-gss \
 	--disable-uuid \
 	--enable-tirpc \
@@ -46,6 +44,13 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \
 	usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service
 
+ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y)
+NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41
+NFS_UTILS_DEPENDENCIES += keyutils libevent lvm2 sqlite
+else
+NFS_UTILS_CONF_OPTS += --disable-nfsv4 --disable-nfsv41
+endif
+
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 NFS_UTILS_CONF_OPTS += --enable-caps
 NFS_UTILS_DEPENDENCIES += libcap
-- 
2.25.1

[Buildroot] [PATCH v2 2/3] package/libtirpc: Add optional GSSAPI support

[James Hilliard]

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/libtirpc/Config.in   | 8 ++++++++
 package/libtirpc/libtirpc.mk | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
index 2e9c939fa8..1899edefbf 100644
--- a/package/libtirpc/Config.in
+++ b/package/libtirpc/Config.in
@@ -7,5 +7,13 @@ config BR2_PACKAGE_LIBTIRPC
 
 	  http://sourceforge.net/projects/libtirpc/
 
+config BR2_PACKAGE_LIBTIRPC_GSS
+	bool "gss"
+	depends on BR2_USE_MMU # libkrb5
+	depends on BR2_PACKAGE_LIBTIRPC
+	select BR2_PACKAGE_LIBKRB5
+	help
+	  Enable GSSAPI support
+
 comment "libtirpc needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk
index 2678c144e9..38f05e493b 100644
--- a/package/libtirpc/libtirpc.mk
+++ b/package/libtirpc/libtirpc.mk
@@ -18,7 +18,13 @@ LIBTIRPC_AUTORECONF = YES
 # getrpcby{number,name} are only provided if 'GQ' is defined
 LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ"
 
-LIBTIRPC_CONF_OPTS = --disable-gssapi
+ifeq ($(BR2_PACKAGE_LIBTIRPC_GSS),y)
+LIBTIRPC_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lgssapi_krb5"
+LIBTIRPC_CONF_OPTS += --enable-gssapi
+LIBTIRPC_DEPENDENCIES += libkrb5
+else
+LIBTIRPC_CONF_OPTS += --disable-gssapi
+endif
 
 define HOST_LIBTIRPC_INSTALL_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/tirpc/rpc/types.h $(HOST_DIR)/include/rpc/types.h
-- 
2.25.1

[Buildroot] [PATCH v2 3/3] package/nfs-utils: Add optional GSS support

[James Hilliard]

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/nfs-utils/Config.in    |  7 +++++++
 package/nfs-utils/nfs-utils.mk | 11 ++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index b736f6c973..d699c9f96f 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -24,6 +24,13 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4
 	help
 	  Enable NFSv4/NFSv4.1 support
 
+config BR2_PACKAGE_NFS_UTILS_GSS
+	bool "gss"
+	depends on BR2_PACKAGE_NFS_UTILS_NFSV4
+	select BR2_PACKAGE_LIBTIRPC_GSS
+	help
+	  Enable GSS support
+
 config BR2_PACKAGE_NFS_UTILS_RPCDEBUG
 	bool "rpcdebug"
 	help
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 2598f0908b..86013b41be 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -16,7 +16,6 @@ NFS_UTILS_AUTORECONF = YES
 NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
 
 NFS_UTILS_CONF_OPTS = \
-	--disable-gss \
 	--disable-uuid \
 	--enable-tirpc \
 	--enable-ipv6 \
@@ -58,6 +57,16 @@ else
 NFS_UTILS_CONF_OPTS += --disable-caps
 endif
 
+ifeq ($(BR2_PACKAGE_NFS_UTILS_GSS),y)
+NFS_UTILS_CONF_OPTS += \
+	--enable-gss \
+	--enable-svcgss \
+	--with-krb5=$(STAGING_DIR)/usr
+NFS_UTILS_DEPENDENCIES += libkrb5
+else
+NFS_UTILS_CONF_OPTS += --disable-gss --disable-svcgss
+endif
+
 define NFS_UTILS_INSTALL_FIXUP
 	cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_)
 	touch $(TARGET_DIR)/etc/exports
-- 
2.25.1

[Buildroot] [PATCH v2 2/3] package/libtirpc: Add optional GSSAPI support

[Yann E. MORIN]

James, All,

On 2021-07-14 21:13 -0600, James Hilliard spake thusly:
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/libtirpc/Config.in   | 8 ++++++++
>  package/libtirpc/libtirpc.mk | 8 +++++++-
>  2 files changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
> index 2e9c939fa8..1899edefbf 100644
> --- a/package/libtirpc/Config.in
> +++ b/package/libtirpc/Config.in
> @@ -7,5 +7,13 @@ config BR2_PACKAGE_LIBTIRPC
>  
>  	  http://sourceforge.net/projects/libtirpc/
>  
> +config BR2_PACKAGE_LIBTIRPC_GSS
> +	bool "gss"
> +	depends on BR2_USE_MMU # libkrb5
> +	depends on BR2_PACKAGE_LIBTIRPC
> +	select BR2_PACKAGE_LIBKRB5
> +	help
> +	  Enable GSSAPI support
> +
>  comment "libtirpc needs a toolchain w/ threads"
>  	depends on !BR2_TOOLCHAIN_HAS_THREADS
> diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk
> index 2678c144e9..38f05e493b 100644
> --- a/package/libtirpc/libtirpc.mk
> +++ b/package/libtirpc/libtirpc.mk
> @@ -18,7 +18,13 @@ LIBTIRPC_AUTORECONF = YES
>  # getrpcby{number,name} are only provided if 'GQ' is defined
>  LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ"
>  
> -LIBTIRPC_CONF_OPTS = --disable-gssapi
> +ifeq ($(BR2_PACKAGE_LIBTIRPC_GSS),y)
> +LIBTIRPC_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lgssapi_krb5"

I think the proper solution would probably to pass the path to
krb5-config:

    LIBTIRPC_CONF_ENV += KRB5_CONFIG=$(STAGING_DIR)/usr/bin/krb5-config

Could you look into that, please?

If that does not work, can you expand the commit log to explain why we
thus need to explicitly pass -l flags, and respin, please?

Regards,
Yann E. MORIN.

> +LIBTIRPC_CONF_OPTS += --enable-gssapi
> +LIBTIRPC_DEPENDENCIES += libkrb5
> +else
> +LIBTIRPC_CONF_OPTS += --disable-gssapi
> +endif
>  
>  define HOST_LIBTIRPC_INSTALL_CMDS
>  	$(INSTALL) -D -m 0644 $(@D)/tirpc/rpc/types.h $(HOST_DIR)/include/rpc/types.h
> -- 
> 2.25.1
> 
> _______________________________________________
> 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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH v2 1/3] package/nfs-utils: enable nfsv4/nfsv4.1 support

[Yann E. MORIN]

James, All,

On 2021-07-14 21:13 -0600, James Hilliard spake thusly:
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

This patch, rebased on-top of UUID support, applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/nfs-utils/Config.in    | 10 ++++++++++
>  package/nfs-utils/nfs-utils.mk |  9 +++++++--
>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
> index da563db0f1..b736f6c973 100644
> --- a/package/nfs-utils/Config.in
> +++ b/package/nfs-utils/Config.in
> @@ -14,6 +14,16 @@ config BR2_PACKAGE_NFS_UTILS
>  
>  if BR2_PACKAGE_NFS_UTILS
>  
> +config BR2_PACKAGE_NFS_UTILS_NFSV4
> +	bool "NFSv4/NFSv4.1"
> +	depends on !BR2_STATIC_LIBS # keyutils, lvm2
> +	select BR2_PACKAGE_KEYUTILS
> +	select BR2_PACKAGE_LIBEVENT
> +	select BR2_PACKAGE_LVM2
> +	select BR2_PACKAGE_SQLITE
> +	help
> +	  Enable NFSv4/NFSv4.1 support
> +
>  config BR2_PACKAGE_NFS_UTILS_RPCDEBUG
>  	bool "rpcdebug"
>  	help
> diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
> index c384e939d8..2598f0908b 100644
> --- a/package/nfs-utils/nfs-utils.mk
> +++ b/package/nfs-utils/nfs-utils.mk
> @@ -16,8 +16,6 @@ NFS_UTILS_AUTORECONF = YES
>  NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
>  
>  NFS_UTILS_CONF_OPTS = \
> -	--disable-nfsv4 \
> -	--disable-nfsv41 \
>  	--disable-gss \
>  	--disable-uuid \
>  	--enable-tirpc \
> @@ -46,6 +44,13 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
>  NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \
>  	usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service
>  
> +ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y)
> +NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41
> +NFS_UTILS_DEPENDENCIES += keyutils libevent lvm2 sqlite
> +else
> +NFS_UTILS_CONF_OPTS += --disable-nfsv4 --disable-nfsv41
> +endif
> +
>  ifeq ($(BR2_PACKAGE_LIBCAP),y)
>  NFS_UTILS_CONF_OPTS += --enable-caps
>  NFS_UTILS_DEPENDENCIES += libcap
> -- 
> 2.25.1
> 
> _______________________________________________
> 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.  |
'------------------------------^-------^------------------^--------------------'