c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

autoconf: use include directives instead of recursing down cmd

Browse Source 
No installation diff, dist lost
  -zfs-2.1.99/cmd/fsck_zfs/fsck.zfs
which was distributed erroneously, since it's generated

Also clean gitrev on clean

Also add -e 'any possible bashisms' to default checkbashisms flags,
and fully parallelise it and shellcheck, and it works out-of-tree, too

Also align the Release in the dist META file correctly

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб
2022-04-09 04:09:55 +02:00
committed by Brian Behlendorf
parent 3ff81c4601
commit 5cdca5b1da
68 changed files with 514 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/Makefile.am
+35 -19
View File
@@ -1,23 +1,39 @@
PHONY =
include $(top_srcdir)/config/Shellcheck.am
include $(top_srcdir)/config/CppCheck.am
bin_SCRIPTS =
bin_PROGRAMS =
sbin_SCRIPTS =
sbin_PROGRAMS =
udev_PROGRAMS =
dist_bin_SCRIPTS =
zfsexec_PROGRAMS =
dist_udev_SCRIPTS =
mounthelper_PROGRAMS =
SUBDIRS = zfs zpool zdb zhack zinject zstream ztest
SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path
SUBDIRS += zpool_influxdb
CPPCHECKDIRS += zfs zpool zdb zhack zinject zstream ztest
CPPCHECKDIRS += raidz_test zfs_ids_to_path zpool_influxdb
# TODO: #12084: SHELLCHECKDIRS += vdev_id
SHELLCHECKDIRS = fsck_zfs zed zpool zvol_wait
if USING_PYTHON
SUBDIRS += arcstat arc_summary dbufstat
endif
include $(srcdir)/%D%/fsck_zfs/Makefile.am
include $(srcdir)/%D%/raidz_test/Makefile.am
include $(srcdir)/%D%/vdev_id/Makefile.am
include $(srcdir)/%D%/zdb/Makefile.am
include $(srcdir)/%D%/zfs/Makefile.am
include $(srcdir)/%D%/zfs_ids_to_path/Makefile.am
include $(srcdir)/%D%/zhack/Makefile.am
include $(srcdir)/%D%/zinject/Makefile.am
include $(srcdir)/%D%/zpool/Makefile.am
include $(srcdir)/%D%/zpool_influxdb/Makefile.am
include $(srcdir)/%D%/zstream/Makefile.am
include $(srcdir)/%D%/ztest/Makefile.am
if BUILD_LINUX
SUBDIRS += mount_zfs zed zgenhostid zvol_id zvol_wait
CPPCHECKDIRS += mount_zfs zed zgenhostid zvol_id
SHELLCHECKDIRS += zed
include $(srcdir)/%D%/mount_zfs/Makefile.am
include $(srcdir)/%D%/zed/Makefile.am
include $(srcdir)/%D%/zgenhostid/Makefile.am
include $(srcdir)/%D%/zvol_id/Makefile.am
include $(srcdir)/%D%/zvol_wait/Makefile.am
endif
if USING_PYTHON
include $(srcdir)/%D%/arc_summary/Makefile.am
include $(srcdir)/%D%/arcstat/Makefile.am
include $(srcdir)/%D%/dbufstat/Makefile.am
endif
PHONY += cmd
cmd: $(bin_SCRIPTS) $(bin_PROGRAMS) $(sbin_SCRIPTS) $(sbin_PROGRAMS) $(udev_PROGRAMS) $(dist_bin_SCRIPTS) $(zfsexec_PROGRAMS) $(dist_udev_SCRIPTS) $(mounthelper_PROGRAMS)
cmd/arc_summary/.gitignore
-1
View File
@@ -1 +0,0 @@
arc_summary
cmd/arc_summary/Makefile.am
+6 -6
View File
@@ -1,8 +1,8 @@
bin_SCRIPTS = arc_summary
bin_SCRIPTS += arc_summary
CLEANFILES += arc_summary
CLEANFILES = arc_summary
EXTRA_DIST = arc_summary3
SCRIPT = arc_summary3
EXTRA_DIST += %D%/arc_summary3
ARC_SUMMARY = %D%/arc_summary3
arc_summary: $(SCRIPT)
cp $< $@
arc_summary: $(ARC_SUMMARY)
$(AM_V_at)cp $< $@
cmd/arcstat/.gitignore
-1
View File
@@ -1 +0,0 @@
arcstat
cmd/arcstat/Makefile.am
+4 -5
View File
@@ -1,5 +1,4 @@
include $(top_srcdir)/config/Substfiles.am
bin_SCRIPTS = arcstat
SUBSTFILES += $(bin_SCRIPTS)
bin_SCRIPTS += arcstat
CLEANFILES += arcstat
EXTRA_DIST += %D%/arcstat.in
$(call SUBST,arcstat,%D%/)
cmd/dbufstat/.gitignore
-1
View File
@@ -1 +0,0 @@
dbufstat
cmd/dbufstat/Makefile.am
+4 -5
View File
@@ -1,5 +1,4 @@
include $(top_srcdir)/config/Substfiles.am
bin_SCRIPTS = dbufstat
SUBSTFILES += $(bin_SCRIPTS)
bin_SCRIPTS += dbufstat
CLEANFILES += dbufstat
EXTRA_DIST += %D%/dbufstat.in
$(call SUBST,dbufstat,%D%/)
cmd/fsck_zfs/.gitignore
-1
View File
@@ -1 +0,0 @@
/fsck.zfs
cmd/fsck_zfs/Makefile.am
+5 -7
View File
@@ -1,7 +1,5 @@
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
dist_sbin_SCRIPTS = fsck.zfs
SUBSTFILES += $(dist_sbin_SCRIPTS)
sbin_SCRIPTS += fsck.zfs
SHELLCHECKSCRIPTS += fsck.zfs
CLEANFILES += fsck.zfs
EXTRA_DIST += %D%/fsck.zfs.in
$(call SUBST,fsck.zfs,%D%/)
cmd/fsck_zfs/fsck.zfs.in
+2 -2
View File
@@ -7,13 +7,13 @@
# see fsck.zfs(8)
#
if [ "$#" = "0" ]; then
if [ $# -eq 0 ]; then
echo "Usage: $0 [options] dataset…" >&2
exit 16
fi
ret=0
for dataset in "$@"; do
for dataset; do
case "$dataset" in
-*)
continue
cmd/mount_zfs/.gitignore
-1
View File
@@ -1 +0,0 @@
mount.zfs
cmd/mount_zfs/Makefile.am
+7 -10
View File
@@ -1,23 +1,20 @@
include $(top_srcdir)/config/Rules.am
#
# Ignore the prefix for the mount helper. It must be installed in /sbin/
# because this path is hardcoded in the mount(8) for security reasons.
# However, if needed, the configure option --with-mounthelperdir= can be used
# to override the default install location.
#
sbindir=$(mounthelperdir)
sbin_PROGRAMS = mount.zfs
mounthelper_PROGRAMS += mount.zfs
CPPCHECKTARGETS += mount.zfs
mount_zfs_SOURCES = \
mount_zfs.c
%D%/mount_zfs.c
mount_zfs_LDADD = \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
libzfs.la \
libzfs_core.la \
libnvpair.la
mount_zfs_LDADD += $(LTLIBINTL)
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += mount.zfs
CPPCHECKTARGETS += raidz_test
cmd/raidz_test/.gitignore
-1
View File
@@ -1 +0,0 @@
/raidz_test
cmd/raidz_test/Makefile.am
+9 -13
View File
@@ -1,20 +1,16 @@
include $(top_srcdir)/config/Rules.am
raidz_test_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
raidz_test_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
AM_CFLAGS += $(KERNEL_CFLAGS)
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
bin_PROGRAMS = raidz_test
bin_PROGRAMS += raidz_test
CPPCHECKTARGETS += raidz_test
raidz_test_SOURCES = \
raidz_test.h \
raidz_test.c \
raidz_bench.c
%D%/raidz_bench.c \
%D%/raidz_test.c \
%D%/raidz_test.h
raidz_test_LDADD = \
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la
libzpool.la \
libzfs_core.la
raidz_test_LDADD += -lm
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += raidz_test
cmd/vdev_id/Makefile.am
+2 -3
View File
@@ -1,3 +1,2 @@
include $(top_srcdir)/config/Shellcheck.am
dist_udev_SCRIPTS = vdev_id
dist_udev_SCRIPTS += %D%/vdev_id
# TODO: #12084: SHELLCHECKSCRIPTS += %D%/vdev_id
cmd/zdb/.gitignore
-1
View File
@@ -1 +0,0 @@
/zdb
cmd/zdb/Makefile.am
+9 -13
View File
@@ -1,18 +1,14 @@
include $(top_srcdir)/config/Rules.am
zdb_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
sbin_PROGRAMS = zdb
sbin_PROGRAMS += zdb
CPPCHECKTARGETS += zdb
zdb_SOURCES = \
zdb.c \
zdb_il.c \
zdb.h
%D%/zdb.c \
%D%/zdb.h \
%D%/zdb_il.c
zdb_LDADD = \
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zdb
libzpool.la \
libzfs_core.la \
libnvpair.la
cmd/zed/Makefile.am
+37 -45
View File
@@ -1,54 +1,46 @@
include $(top_srcdir)/config/Rules.am
include $(top_srcdir)/config/Shellcheck.am
include $(srcdir)/%D%/zed.d/Makefile.am
AM_CFLAGS += $(LIBUDEV_CFLAGS) $(LIBUUID_CFLAGS)
zed_CFLAGS = $(AM_CFLAGS)
zed_CFLAGS += $(LIBUDEV_CFLAGS) $(LIBUUID_CFLAGS)
SUBDIRS = zed.d
SHELLCHECKDIRS = $(SUBDIRS)
sbin_PROGRAMS += zed
CPPCHECKTARGETS += zed
sbin_PROGRAMS = zed
ZED_SRC = \
zed.c \
zed.h \
zed_conf.c \
zed_conf.h \
zed_disk_event.c \
zed_disk_event.h \
zed_event.c \
zed_event.h \
zed_exec.c \
zed_exec.h \
zed_file.c \
zed_file.h \
zed_log.c \
zed_log.h \
zed_strings.c \
zed_strings.h
FMA_SRC = \
agents/zfs_agents.c \
agents/zfs_agents.h \
agents/zfs_diagnosis.c \
agents/zfs_mod.c \
agents/zfs_retire.c \
agents/fmd_api.c \
agents/fmd_api.h \
agents/fmd_serd.c \
agents/fmd_serd.h
zed_SOURCES = $(ZED_SRC) $(FMA_SRC)
zed_SOURCES = \
%D%/zed.c \
%D%/zed.h \
%D%/zed_conf.c \
%D%/zed_conf.h \
%D%/zed_disk_event.c \
%D%/zed_disk_event.h \
%D%/zed_event.c \
%D%/zed_event.h \
%D%/zed_exec.c \
%D%/zed_exec.h \
%D%/zed_file.c \
%D%/zed_file.h \
%D%/zed_log.c \
%D%/zed_log.h \
%D%/zed_strings.c \
%D%/zed_strings.h \
\
%D%/agents/fmd_api.c \
%D%/agents/fmd_api.h \
%D%/agents/fmd_serd.c \
%D%/agents/fmd_serd.h \
%D%/agents/zfs_agents.c \
%D%/agents/zfs_agents.h \
%D%/agents/zfs_diagnosis.c \
%D%/agents/zfs_mod.c \
%D%/agents/zfs_retire.c
zed_LDADD = \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la \
$(abs_top_builddir)/libuutil.la
libzfs.la \
libzfs_core.la \
libnvpair.la \
libuutil.la
zed_LDADD += -lrt $(LIBATOMIC_LIBS) $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
zed_LDFLAGS = -pthread
EXTRA_DIST = agents/README.md
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zed
EXTRA_DIST += $(addprefix %D%/,agents/README.md)
cmd/zed/zed.d/Makefile.am
+31 -35
View File
@@ -1,36 +1,27 @@
include $(top_srcdir)/config/Rules.am
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
EXTRA_DIST += README
zedconfdir = $(sysconfdir)/zfs/zed.d
dist_zedconf_DATA = \
zed-functions.sh \
zed.rc
SHELLCHECKSCRIPTS = zed-functions.sh zed.rc
SHELLCHECK_SHELL = sh
%D%/zed-functions.sh \
%D%/zed.rc
zedexecdir = $(zfsexecdir)/zed.d
dist_zedexec_SCRIPTS = \
all-debug.sh \
all-syslog.sh \
data-notify.sh \
generic-notify.sh \
resilver_finish-notify.sh \
scrub_finish-notify.sh \
statechange-led.sh \
statechange-notify.sh \
vdev_clear-led.sh \
vdev_attach-led.sh \
pool_import-led.sh \
resilver_finish-start-scrub.sh \
trim_finish-notify.sh
%D%/all-debug.sh \
%D%/all-syslog.sh \
%D%/data-notify.sh \
%D%/generic-notify.sh \
%D%/pool_import-led.sh \
%D%/resilver_finish-notify.sh \
%D%/resilver_finish-start-scrub.sh \
%D%/scrub_finish-notify.sh \
%D%/statechange-led.sh \
%D%/statechange-notify.sh \
%D%/trim_finish-notify.sh \
%D%/vdev_attach-led.sh \
%D%/vdev_clear-led.sh
nodist_zedexec_SCRIPTS = history_event-zfs-list-cacher.sh
nodist_zedexec_SCRIPTS = \
%D%/history_event-zfs-list-cacher.sh
SUBSTFILES += $(nodist_zedexec_SCRIPTS)
@@ -38,22 +29,27 @@ zedconfdefaults = \
all-syslog.sh \
data-notify.sh \
history_event-zfs-list-cacher.sh \
pool_import-led.sh \
resilver_finish-notify.sh \
resilver_finish-start-scrub.sh \
scrub_finish-notify.sh \
statechange-led.sh \
statechange-notify.sh \
vdev_clear-led.sh \
vdev_attach-led.sh \
pool_import-led.sh \
resilver_finish-start-scrub.sh
vdev_clear-led.sh
install-data-hook:
EXTRA_DIST += $(addprefix %D%/,README)
INSTALL_DATA_HOOKS += zed-install-data-hook
zed-install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(zedconfdir)"
for f in $(zedconfdefaults); do \
test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
-L "$(DESTDIR)$(zedconfdir)/$${f}" || \
ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
set -x; for f in $(zedconfdefaults); do \
[ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
[ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
$(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
done
SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)
$(call SHELLCHECK_OPTS,$(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)): SHELLCHECK_SHELL = sh
# False positive: 1>&"${ZED_FLOCK_FD}" looks suspiciously similar to a >&filename bash extension
CHECKBASHISMS_IGNORE = -e 'should be >word 2>&1' -e '&"$${ZED_FLOCK_FD}"'
$(call SHELLCHECK_OPTS,$(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)): CHECKBASHISMS_IGNORE = -e 'should be >word 2>&1' -e '&"$${ZED_FLOCK_FD}"'
cmd/zfs/.gitignore
-1
View File
@@ -1 +0,0 @@
/zfs
cmd/zfs/Makefile.am
+12 -16
View File
@@ -1,26 +1,22 @@
include $(top_srcdir)/config/Rules.am
sbin_PROGRAMS = zfs
sbin_PROGRAMS += zfs
CPPCHECKTARGETS += zfs
zfs_SOURCES = \
zfs_iter.c \
zfs_iter.h \
zfs_main.c \
zfs_util.h \
zfs_project.c \
zfs_projectutil.h
%D%/zfs_iter.c \
%D%/zfs_iter.h \
%D%/zfs_main.c \
%D%/zfs_project.c \
%D%/zfs_projectutil.h \
%D%/zfs_util.h
zfs_LDADD = \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la \
$(abs_top_builddir)/libuutil.la
libzfs.la \
libzfs_core.la \
libnvpair.la \
libuutil.la
zfs_LDADD += $(LTLIBINTL)
if BUILD_FREEBSD
zfs_LDADD += -lgeom -ljail
endif
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zfs
cmd/zfs_ids_to_path/.gitignore
-1
View File
@@ -1 +0,0 @@
zfs_ids_to_path
cmd/zfs_ids_to_path/Makefile.am
+4 -8
View File
@@ -1,12 +1,8 @@
include $(top_srcdir)/config/Rules.am
sbin_PROGRAMS = zfs_ids_to_path
sbin_PROGRAMS += zfs_ids_to_path
CPPCHECKTARGETS += zfs_ids_to_path
zfs_ids_to_path_SOURCES = \
zfs_ids_to_path.c
%D%/zfs_ids_to_path.c
zfs_ids_to_path_LDADD = \
$(abs_top_builddir)/libzfs.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zfs_ids_to_path
libzfs.la
cmd/zgenhostid/.gitignore
-1
View File
@@ -1 +0,0 @@
/zgenhostid
cmd/zgenhostid/Makefile.am
+4 -7
View File
@@ -1,8 +1,5 @@
include $(top_srcdir)/config/Rules.am
sbin_PROGRAMS = zgenhostid
zgenhostid_SOURCES = zgenhostid.c
include $(top_srcdir)/config/CppCheck.am
sbin_PROGRAMS += zgenhostid
CPPCHECKTARGETS += zgenhostid
zgenhostid_SOURCES = \
%D%/zgenhostid.c
cmd/zhack/.gitignore
-1
View File
@@ -1 +0,0 @@
/zhack
cmd/zhack/Makefile.am
+7 -11
View File
@@ -1,16 +1,12 @@
include $(top_srcdir)/config/Rules.am
zhack_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
sbin_PROGRAMS = zhack
sbin_PROGRAMS += zhack
CPPCHECKTARGETS += zhack
zhack_SOURCES = \
zhack.c
%D%/zhack.c
zhack_LDADD = \
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zhack
libzpool.la \
libzfs_core.la \
libnvpair.la
cmd/zinject/.gitignore
-1
View File
@@ -1 +0,0 @@
/zinject
cmd/zinject/Makefile.am
+8 -12
View File
@@ -1,16 +1,12 @@
include $(top_srcdir)/config/Rules.am
sbin_PROGRAMS = zinject
sbin_PROGRAMS += zinject
CPPCHECKTARGETS += zinject
zinject_SOURCES = \
translate.c \
zinject.c \
zinject.h
%D%/translate.c \
%D%/zinject.c \
%D%/zinject.h
zinject_LDADD = \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zinject
libzfs.la \
libzfs_core.la \
libnvpair.la
cmd/zpool/.gitignore
-1
View File
@@ -1 +0,0 @@
/zpool
cmd/zpool/Makefile.am
+95 -96
View File
@@ -1,34 +1,35 @@
include $(top_srcdir)/config/Rules.am
include $(top_srcdir)/config/Shellcheck.am
zpool_CFLAGS = $(AM_CFLAGS)
zpool_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUUID_CFLAGS)
AM_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUUID_CFLAGS)
zpool_CPPFLAGS = $(AM_CPPFLAGS)
zpool_CPPFLAGS += -I$(srcdir)/%D%
AM_CPPFLAGS += -I$(srcdir)
sbin_PROGRAMS = zpool
sbin_PROGRAMS += zpool
CPPCHECKTARGETS += zpool
zpool_SOURCES = \
zpool_iter.c \
zpool_main.c \
zpool_util.c \
zpool_util.h \
zpool_vdev.c
%D%/zpool_iter.c \
%D%/zpool_main.c \
%D%/zpool_util.c \
%D%/zpool_util.h \
%D%/zpool_vdev.c
if BUILD_FREEBSD
zpool_SOURCES += os/freebsd/zpool_vdev_os.c
zpool_SOURCES += \
%D%/os/freebsd/zpool_vdev_os.c
endif
if BUILD_LINUX
zpool_SOURCES += os/linux/zpool_vdev_os.c
zpool_SOURCES += \
%D%/os/linux/zpool_vdev_os.c
endif
zpool_LDADD = \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la \
$(abs_top_builddir)/libuutil.la \
$(abs_top_builddir)/libzutil.la
libzfs.la \
libzfs_core.la \
libnvpair.la \
libuutil.la \
libzutil.la
zpool_LDADD += $(LTLIBINTL)
@@ -37,57 +38,53 @@ zpool_LDADD += -lgeom
endif
zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS)
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zpool
EXTRA_DIST += $(addprefix %D%/,zpool.d/README compatibility.d)
zpoolconfdir = $(sysconfdir)/zfs/zpool.d
SHELLCHECKSCRIPTS += $(dist_zpoolexec_SCRIPTS)
zpoolexecdir = $(zfsexecdir)/zpool.d
EXTRA_DIST = zpool.d/README compatibility.d
dist_zpoolexec_SCRIPTS = \
zpool.d/dm-deps \
zpool.d/enc \
zpool.d/encdev \
zpool.d/fault_led \
zpool.d/iostat \
zpool.d/iostat-1s \
zpool.d/iostat-10s \
zpool.d/label \
zpool.d/locate_led \
zpool.d/lsblk \
zpool.d/media \
zpool.d/model \
zpool.d/serial \
zpool.d/ses \
zpool.d/size \
zpool.d/slot \
zpool.d/smart \
zpool.d/smartx \
zpool.d/temp \
zpool.d/health \
zpool.d/r_proc \
zpool.d/w_proc \
zpool.d/r_ucor \
zpool.d/w_ucor \
zpool.d/nonmed \
zpool.d/defect \
zpool.d/hours_on \
zpool.d/realloc \
zpool.d/rep_ucor \
zpool.d/cmd_to \
zpool.d/pend_sec \
zpool.d/off_ucor \
zpool.d/ata_err \
zpool.d/nvme_err \
zpool.d/pwr_cyc \
zpool.d/upath \
zpool.d/vendor \
zpool.d/smart_test \
zpool.d/test_type \
zpool.d/test_status \
zpool.d/test_progress \
zpool.d/test_ended
%D%/zpool.d/ata_err \
%D%/zpool.d/cmd_to \
%D%/zpool.d/defect \
%D%/zpool.d/dm-deps \
%D%/zpool.d/enc \
%D%/zpool.d/encdev \
%D%/zpool.d/fault_led \
%D%/zpool.d/health \
%D%/zpool.d/hours_on \
%D%/zpool.d/iostat \
%D%/zpool.d/iostat-10s \
%D%/zpool.d/iostat-1s \
%D%/zpool.d/label \
%D%/zpool.d/locate_led \
%D%/zpool.d/lsblk \
%D%/zpool.d/media \
%D%/zpool.d/model \
%D%/zpool.d/nonmed \
%D%/zpool.d/nvme_err \
%D%/zpool.d/off_ucor \
%D%/zpool.d/pend_sec \
%D%/zpool.d/pwr_cyc \
%D%/zpool.d/r_proc \
%D%/zpool.d/r_ucor \
%D%/zpool.d/realloc \
%D%/zpool.d/rep_ucor \
%D%/zpool.d/serial \
%D%/zpool.d/ses \
%D%/zpool.d/size \
%D%/zpool.d/slot \
%D%/zpool.d/smart \
%D%/zpool.d/smart_test \
%D%/zpool.d/smartx \
%D%/zpool.d/temp \
%D%/zpool.d/test_ended \
%D%/zpool.d/test_progress \
%D%/zpool.d/test_status \
%D%/zpool.d/test_type \
%D%/zpool.d/upath \
%D%/zpool.d/vendor \
%D%/zpool.d/w_proc \
%D%/zpool.d/w_ucor
zpoolconfdefaults = \
dm-deps \
@@ -134,29 +131,28 @@ zpoolconfdefaults = \
test_ended
zpoolcompatdir = $(pkgdatadir)/compatibility.d
dist_zpoolcompat_DATA = \
compatibility.d/compat-2018 \
compatibility.d/compat-2019 \
compatibility.d/compat-2020 \
compatibility.d/compat-2021 \
compatibility.d/freebsd-11.0 \
compatibility.d/freebsd-11.2 \
compatibility.d/freebsd-11.3 \
compatibility.d/freenas-9.10.2 \
compatibility.d/grub2 \
compatibility.d/openzfsonosx-1.7.0 \
compatibility.d/openzfsonosx-1.8.1 \
compatibility.d/openzfsonosx-1.9.3 \
compatibility.d/openzfs-2.0-freebsd \
compatibility.d/openzfs-2.0-linux \
compatibility.d/openzfs-2.1-freebsd \
compatibility.d/openzfs-2.1-linux \
compatibility.d/zol-0.6.1 \
compatibility.d/zol-0.6.4 \
compatibility.d/zol-0.6.5 \
compatibility.d/zol-0.7 \
compatibility.d/zol-0.8
%D%/compatibility.d/compat-2018 \
%D%/compatibility.d/compat-2019 \
%D%/compatibility.d/compat-2020 \
%D%/compatibility.d/compat-2021 \
%D%/compatibility.d/freebsd-11.0 \
%D%/compatibility.d/freebsd-11.2 \
%D%/compatibility.d/freebsd-11.3 \
%D%/compatibility.d/freenas-9.10.2 \
%D%/compatibility.d/grub2 \
%D%/compatibility.d/openzfs-2.0-freebsd \
%D%/compatibility.d/openzfs-2.0-linux \
%D%/compatibility.d/openzfs-2.1-freebsd \
%D%/compatibility.d/openzfs-2.1-linux \
%D%/compatibility.d/openzfsonosx-1.7.0 \
%D%/compatibility.d/openzfsonosx-1.8.1 \
%D%/compatibility.d/openzfsonosx-1.9.3 \
%D%/compatibility.d/zol-0.6.1 \
%D%/compatibility.d/zol-0.6.4 \
%D%/compatibility.d/zol-0.6.5 \
%D%/compatibility.d/zol-0.7 \
%D%/compatibility.d/zol-0.8
# canonical <- alias symbolic link pairs
# eg: "2018" is a link to "compat-2018"
@@ -179,13 +175,16 @@ zpoolcompatlinks = \
"zol-0.7 ubuntu-18.04" \
"zol-0.8 ubuntu-20.04"
install-data-hook:
zpoolconfdir = $(sysconfdir)/zfs/zpool.d
INSTALL_DATA_HOOKS += zpool-install-data-hook
zpool-install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(zpoolconfdir)"
for f in $(zpoolconfdefaults); do \
test -f "$(DESTDIR)$(zpoolconfdir)/$${f}" -o \
-L "$(DESTDIR)$(zpoolconfdir)/$${f}" || \
ln -s "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
set -x; for f in $(zpoolconfdefaults); do \
[ -f "$(DESTDIR)$(zpoolconfdir)/$${f}" ] || \
[ -L "$(DESTDIR)$(zpoolconfdir)/$${f}" ] || \
$(LN_S) "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
done
for l in $(zpoolcompatlinks); do \
(cd "$(DESTDIR)$(zpoolcompatdir)"; ln -sf $${l} ); \
set -x; printf '%s\n' $(zpoolcompatlinks) | \
while read -r canon alias; do \
$(LN_S) -f "$${canon}" "$(DESTDIR)$(zpoolcompatdir)/$${alias}"; \
done
cmd/zpool_influxdb/.gitignore
-1
View File
@@ -1 +0,0 @@
/zpool_influxdb
cmd/zpool_influxdb/Makefile.am
+6 -10
View File
@@ -1,14 +1,10 @@
include $(top_srcdir)/config/Rules.am
zfsexec_PROGRAMS = zpool_influxdb
zfsexec_PROGRAMS += zpool_influxdb
CPPCHECKTARGETS += zpool_influxdb
zpool_influxdb_SOURCES = \
zpool_influxdb.c
%D%/zpool_influxdb.c
zpool_influxdb_LDADD = \
$(top_builddir)/libspl.la \
$(top_builddir)/libnvpair.la \
$(top_builddir)/libzfs.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zpool_influxdb
libspl.la \
libnvpair.la \
libzfs.la
cmd/zstream/.gitignore
-1
View File
@@ -1 +0,0 @@
zstream
cmd/zstream/Makefile.am
+14 -17
View File
@@ -1,21 +1,18 @@
include $(top_srcdir)/config/Rules.am
sbin_PROGRAMS = zstream
zstream_SOURCES = \
zstream.c \
zstream.h \
zstream_dump.c \
zstream_redup.c \
zstream_token.c
zstream_LDADD = \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
sbin_PROGRAMS += zstream
CPPCHECKTARGETS += zstream
zstream_SOURCES = \
%D%/zstream.c \
%D%/zstream.h \
%D%/zstream_dump.c \
%D%/zstream_redup.c \
%D%/zstream_token.c
zstream_LDADD = \
libzfs.la \
libzfs_core.la \
libnvpair.la
PHONY += install-exec-hook
install-exec-hook:
cd $(DESTDIR)$(sbindir) && $(LN_S) -f zstream zstreamdump
cmd/ztest/.gitignore
-1
View File
@@ -1 +0,0 @@
/ztest
cmd/ztest/Makefile.am
+9 -15
View File
@@ -1,24 +1,18 @@
include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(KERNEL_CFLAGS)
ztest_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
# Get rid of compiler warning for unchecked truncating snprintfs on gcc 7.1.1
AM_CFLAGS += $(NO_FORMAT_TRUNCATION)
ztest_CFLAGS += $(NO_FORMAT_TRUNCATION)
ztest_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
sbin_PROGRAMS = ztest
sbin_PROGRAMS += ztest
CPPCHECKTARGETS += ztest
ztest_SOURCES = \
ztest.c
%D%/ztest.c
ztest_LDADD = \
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
libzpool.la \
libzfs_core.la \
libnvpair.la
ztest_LDADD += -lm
ztest_LDFLAGS = -pthread
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += ztest
cmd/zvol_id/.gitignore
-1
View File
@@ -1 +0,0 @@
zvol_id
cmd/zvol_id/Makefile.am
+3 -7
View File
@@ -1,9 +1,5 @@
include $(top_srcdir)/config/Rules.am
udev_PROGRAMS = zvol_id
udev_PROGRAMS += zvol_id
CPPCHECKTARGETS += zvol_id
zvol_id_SOURCES = \
zvol_id_main.c
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zvol_id
%D%/zvol_id_main.c
cmd/zvol_wait/Makefile.am
+2 -3
View File
@@ -1,3 +1,2 @@
include $(top_srcdir)/config/Shellcheck.am
dist_bin_SCRIPTS = zvol_wait
dist_bin_SCRIPTS += %D%/zvol_wait
SHELLCHECKSCRIPTS += %D%/zvol_wait