Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Adjust zfsd Makefiles for openzfs compatibility 

Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
This commit is contained in:
Ameer Hamza 2023-06-20 05:39:47 +05:00
parent 35ca19b591
commit 3c72bef6bd
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -119,7 +119,7 @@ cstyle_line = -exec ${top_srcdir}/scripts/cstyle.pl -cpP {} +
endif endif
CHECKS += cstyle CHECKS += cstyle
cstyle: cstyle:
$(AM_V_at)find $(top_srcdir) -name build -prune \ $(AM_V_at)find $(top_srcdir) -name build -prune -o -name zfsd -prune \
-o -type f -name '*.[hc]' \ -o -type f -name '*.[hc]' \
! -name 'zfs_config.*' ! -name '*.mod.c' \ ! -name 'zfs_config.*' ! -name '*.mod.c' \
! -name 'nfs41acl_xdr.c' ! -name 'nfs41acl.h' \ ! -name 'nfs41acl_xdr.c' ! -name 'nfs41acl.h' \

3
cmd/Makefile.am
View File

@ -66,6 +66,9 @@ include $(srcdir)/%D%/zpool/Makefile.am
include $(srcdir)/%D%/zpool_influxdb/Makefile.am include $(srcdir)/%D%/zpool_influxdb/Makefile.am
include $(srcdir)/%D%/zstream/Makefile.am include $(srcdir)/%D%/zstream/Makefile.am
if BUILD_FREEBSD
include $(srcdir)/%D%/zfsd/Makefile.am
endif
if BUILD_LINUX if BUILD_LINUX
mounthelper_PROGRAMS += mount.zfs mounthelper_PROGRAMS += mount.zfs

32
cmd/zfsd/Makefile.am
View File

@ -1,23 +1,25 @@
include $(top_srcdir)/config/Rules.am zfsd_CFLAGS = $(AM_CFLAGS)
zfsd_CXXFLAGS = $(AM_CXXFLAGS)
zfsd_CPPFLAGS = $(AM_CPPFLAGS)
sbin_PROGRAMS = zfsd sbin_PROGRAMS += zfsd
zfsd_SOURCES = \ zfsd_SOURCES = \
callout.cc \ %D%/callout.cc \
case_file.cc \ %D%/case_file.cc \
vdev.cc \ %D%/vdev.cc \
vdev_iterator.cc \ %D%/vdev_iterator.cc \
zfsd.cc \ %D%/zfsd.cc \
zfsd_event.cc \ %D%/zfsd_event.cc \
zfsd_exception.cc \ %D%/zfsd_exception.cc \
zfsd_main.cc \ %D%/zfsd_main.cc \
zpool_list.cc %D%/zpool_list.cc
zfsd_LDADD = \ zfsd_LDADD = \
$(top_builddir)/lib/libnvpair/libnvpair.la \ libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la \ libuutil.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \ libzfs_core.la \
$(top_builddir)/lib/libzfs/libzfs.la libzfs.la
zfsd_LDADD += -lrt -lprivatedevdctl -lgeom -lbsdxml -lsbuf zfsd_LDADD += -lrt -lprivatedevdctl -lgeom -lbsdxml -lsbuf
zfsd_LDFLAGS = -pthread zfsd_LDFLAGS = -pthread

9
etc/Makefile.am
View File

@ -21,6 +21,15 @@ SUBSTFILES += $(sysconf_zfs_DATA)
SHELLCHECKSCRIPTS += $(sysconf_zfs_DATA) SHELLCHECKSCRIPTS += $(sysconf_zfs_DATA)
$(call SHELLCHECK_OPTS,$(sysconf_zfs_DATA)): SHELLCHECK_SHELL = sh $(call SHELLCHECK_OPTS,$(sysconf_zfs_DATA)): SHELLCHECK_SHELL = sh
if BUILD_FREEBSD
sysconf_zfsddir = $(sysconfdir)/rc.d
sysconf_zfsd_DATA = %D%/rc.d/zfsd
SUBSTFILES += $(sysconf_zfsd_DATA)
SHELLCHECKSCRIPTS += $(sysconf_zfsd_DATA)
$(call SHELLCHECK_OPTS,$(sysconf_zfsd_DATA)): SHELLCHECK_SHELL = sh
endif
if BUILD_LINUX if BUILD_LINUX
initconf_DATA = \ initconf_DATA = \

2
include/sys/zfs_context.h
View File

@ -695,8 +695,10 @@ extern char *kmem_asprintf(const char *fmt, ...);
#define kmem_strfree(str) kmem_free((str), strlen(str) + 1) #define kmem_strfree(str) kmem_free((str), strlen(str) + 1)
#define kmem_strdup(s) strdup(s) #define kmem_strdup(s) strdup(s)
#ifndef __cplusplus
extern int kmem_scnprintf(char *restrict str, size_t size, extern int kmem_scnprintf(char *restrict str, size_t size,
const char *restrict fmt, ...); const char *restrict fmt, ...);
#endif
/* /*
* Hostname information * Hostname information