Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (41ef9e3894412ab315573423f486cd75e78b9bac)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (41ef9e3894412ab315573423f486cd75e78b9bac)
  • Date: Mon, 26 Sep 2016 20:27:33 +0000

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/nfs-utils/DEPENDS | 2 +-
net/nfs-utils/HISTORY | 4 ++++
net/nfs-utils/PRE_BUILD | 15 ++++++++++++---
3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 41ef9e3894412ab315573423f486cd75e78b9bac
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nfs-utils: Check for CONFIG_NFS_V4 and CONFIG_NFS_V4_1 as needed

(cherry picked from commit 7a327ca07a274ba29eb053c401a01d1eb3cb2148)

commit 03c7580376f76f91ca7cb25cb4d0e5bbd5d18f2b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nfs-utils: Use correct CONFIG_NFS_V4 check for NFSv4

Disable both nfsv4 and nfsv41 if NFSv4 is not selected

(cherry picked from commit c4465a0cb64dbb662a2b675773b9e52a9382c7f0)

diff --git a/net/nfs-utils/DEPENDS b/net/nfs-utils/DEPENDS
index f7d1a23..3ff655c 100755
--- a/net/nfs-utils/DEPENDS
+++ b/net/nfs-utils/DEPENDS
@@ -20,5 +20,5 @@ if [[ "$NFS_UTILS_NFSV4" == "--enable-nfsv4" ]]; then
"--disable-nfsv41" \
"for NFS v4.1 support"
else
- list_add "NFS_UTILS_NFSV4" "--disable-nfsv41"
+ list_add "NFS_UTILS_NFSV4" "--disable-nfsv4 --disable-nfsv41"
fi
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index a5c9248..138399c 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,7 @@
+2015-11-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Use correct CONFIG_NFS_V4 check for NFSv4
+ Check for CONFIG_NFS_V4 and CONFIG_NFS_V4_1 as needed.
+
2015-10-31 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: idmapd support requires DNOTIFY enabled in the kernel.

diff --git a/net/nfs-utils/PRE_BUILD b/net/nfs-utils/PRE_BUILD
index 434977b..29b2fca 100755
--- a/net/nfs-utils/PRE_BUILD
+++ b/net/nfs-utils/PRE_BUILD
@@ -1,9 +1,18 @@
if list_find "${NFS_UTILS_NFSV4}" "--enable-nfsv4"; then
- if [[ "$(get_kernel_config NFS_UTILS_NFSV4)" != "y" &&
- "$(get_kernel_config NFS_UTILS_NFSV4)" != "m" ]]; then
+ if [[ "$(get_kernel_config CONFIG_NFS_V4)" != "y" &&
+ "$(get_kernel_config CONFIG_NFS_V4)" != "m" ]]; then
message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
- "NFS_UTILS_NFSV4 module/built-in${DEFAULT_COLOR}" &&
+ "CONFIG_NFS_V4 module/built-in${DEFAULT_COLOR}" &&
return 1
+
+ if is_spell_enabled ${SPELL} lvm; then
+ if [[ "$(get_kernel_config CONFIG_NFS_V4_1)" != "y" &&
+ "$(get_kernel_config CONFIG_NFS_V4_1)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR}
requires" \
+ "CONFIG_NFS_V4_1 module/built-in${DEFAULT_COLOR}" &&
+ return 1
+ fi
+ fi
fi
fi &&




  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (41ef9e3894412ab315573423f486cd75e78b9bac), Vlad Glagolev, 09/26/2016

Archive powered by MHonArc 2.6.24.

Top of Page