The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=32b0830aa03035fd06efa9da917ec6b7c3c65310

commit 32b0830aa03035fd06efa9da917ec6b7c3c65310
Author:     Siva Mahadevan <m...@svmhdvn.name>
AuthorDate: 2024-09-21 19:43:02 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2024-09-21 21:15:33 +0000

    conf: make ZFS depend on XDR sources
    
    ZFS nvpair.c source file depends on XDR unconditionally. This
    fixes the ZFS build with NFSD kernel options disabled.
    
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1429
---
 sys/conf/files | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 9cb22af79ade..cb288bc8a5bc 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -5296,9 +5296,9 @@ xen/xenbus/xenbusb.c              optional xenhvm
 xen/xenbus/xenbusb_front.c     optional xenhvm
 xen/xenbus/xenbusb_back.c      optional xenhvm
 xen/xenmem/xenmem_if.m         optional xenhvm
-xdr/xdr.c                      optional xdr | krpc | nfslockd | nfscl | nfsd
-xdr/xdr_array.c                        optional xdr | krpc | nfslockd | nfscl 
| nfsd
-xdr/xdr_mbuf.c                 optional xdr | krpc | nfslockd | nfscl | nfsd
-xdr/xdr_mem.c                  optional xdr | krpc | nfslockd | nfscl | nfsd
-xdr/xdr_reference.c            optional xdr | krpc | nfslockd | nfscl | nfsd
-xdr/xdr_sizeof.c               optional xdr | krpc | nfslockd | nfscl | nfsd
+xdr/xdr.c                      optional xdr | krpc | nfslockd | nfscl | nfsd | 
zfs
+xdr/xdr_array.c                        optional xdr | krpc | nfslockd | nfscl 
| nfsd | zfs
+xdr/xdr_mbuf.c                 optional xdr | krpc | nfslockd | nfscl | nfsd | 
zfs
+xdr/xdr_mem.c                  optional xdr | krpc | nfslockd | nfscl | nfsd | 
zfs
+xdr/xdr_reference.c            optional xdr | krpc | nfslockd | nfscl | nfsd | 
zfs
+xdr/xdr_sizeof.c               optional xdr | krpc | nfslockd | nfscl | nfsd | 
zfs

Reply via email to