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

autoconf: use include directives instead of recursing down etc

Browse Source 
dist diff:
  -zfs-2.1.99/etc/systemd/system/50-zfs.preset.in
  +zfs-2.1.99/etc/systemd/system/50-zfs.preset

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-10 01:19:15 +02:00
committed by Brian Behlendorf
parent 50d2c9e4fd
commit 48f4379974
20 changed files with 113 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/Makefile.am
+91 -5
View File
@@ -1,9 +1,95 @@
include $(top_srcdir)/config/Shellcheck.am
sudoersddir = $(sysconfdir)/sudoers.d
sudoersd_DATA = \
%D%/sudoers.d/zfs
EXTRA_DIST += $(sudoersd_DATA)
sysconf_zfsdir = $(sysconfdir)/zfs
dist_sysconf_zfs_DATA = \
%D%/zfs/vdev_id.conf.alias.example \
%D%/zfs/vdev_id.conf.multipath.example \
%D%/zfs/vdev_id.conf.sas_direct.example \
%D%/zfs/vdev_id.conf.sas_switch.example \
%D%/zfs/vdev_id.conf.scsi.example
sysconf_zfs_SCRIPTS = \
%D%/zfs/zfs-functions
SUBSTFILES += $(sysconf_zfs_SCRIPTS)
SHELLCHECKSCRIPTS += $(sysconf_zfs_SCRIPTS)
$(call SHELLCHECK_OPTS,$(sysconf_zfs_SCRIPTS)): SHELLCHECK_SHELL = sh
SUBDIRS = zfs sudoers.d
SHELLCHECKDIRS = default $(ZFS_INIT_SYSV) zfs
if BUILD_LINUX
SUBDIRS += default $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD)
initconf_SCRIPTS = \
%D%/default/zfs
SUBSTFILES += $(initconf_SCRIPTS)
SHELLCHECKSCRIPTS += $(initconf_SCRIPTS)
$(call SHELLCHECK_OPTS,$(initconf_SCRIPTS)): SHELLCHECK_SHELL = sh
if INIT_SYSV
EXTRA_DIST += $(addprefix %D%/,init.d/README.md)
init_SCRIPTS = \
%D%/init.d/zfs-import \
%D%/init.d/zfs-load-key \
%D%/init.d/zfs-mount \
%D%/init.d/zfs-share \
%D%/init.d/zfs-zed
SUBSTFILES += $(init_SCRIPTS)
SHELLCHECKSCRIPTS += $(init_SCRIPTS)
$(call SHELLCHECK_OPTS,$(init_SCRIPTS)): SHELLCHECK_SHELL = sh
endif
if INIT_SYSTEMD
dist_systemdpreset_DATA = \
%D%/systemd/system/50-zfs.preset
systemdunit_DATA = \
%D%/systemd/system/zfs-import-cache.service \
%D%/systemd/system/zfs-import-scan.service \
%D%/systemd/system/zfs-import.target \
%D%/systemd/system/zfs-mount.service \
%D%/systemd/system/zfs-scrub-monthly@.timer \
%D%/systemd/system/zfs-scrub-weekly@.timer \
%D%/systemd/system/zfs-scrub@.service \
%D%/systemd/system/zfs-share.service \
%D%/systemd/system/zfs-volume-wait.service \
%D%/systemd/system/zfs-volumes.target \
%D%/systemd/system/zfs-zed.service \
%D%/systemd/system/zfs.target
SUBSTFILES += $(systemdunit_DATA)
INSTALL_DATA_HOOKS += systemd-install-data-hook
systemd-install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
systemdgenerator_PROGRAMS = \
%D%/systemd/system-generators/zfs-mount-generator
%C%_systemd_system_generators_zfs_mount_generator_SOURCES = \
%D%/systemd/system-generators/zfs-mount-generator.c
%C%_systemd_system_generators_zfs_mount_generator_LDADD = \
libzfs.la
%C%_systemd_system_generators_zfs_mount_generator_LDFLAGS = -pthread
CPPCHECKTARGETS += $(systemdgenerator_PROGRAMS)
endif
if WANT_MODULES_LOAD_D
dist_modulesload_DATA = \
%D%/modules-load.d/zfs.conf
endif
endif
DIST_SUBDIRS = default init.d zfs systemd modules-load.d sudoers.d
etc/default/Makefile.am
-11
View File
@@ -1,11 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
initconf_SCRIPTS = zfs
SUBSTFILES += $(initconf_SCRIPTS)
SHELLCHECK_SHELL = sh
SHELLCHECKSCRIPTS += $(initconf_SCRIPTS)
etc/init.d/Makefile.am
-13
View File
@@ -1,13 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
EXTRA_DIST += README.md
init_SCRIPTS = zfs-import zfs-load-key zfs-mount zfs-share zfs-zed
SUBSTFILES += $(init_SCRIPTS)
SHELLCHECK_SHELL = sh
SHELLCHECKSCRIPTS += $(init_SCRIPTS)
etc/modules-load.d/.gitignore
-1
View File
@@ -1 +0,0 @@
*.conf
etc/modules-load.d/Makefile.am
-2
View File
@@ -1,2 +0,0 @@
dist_modulesload_DATA = \
zfs.conf
etc/sudoers.d/Makefile.am
-5
View File
@@ -1,5 +0,0 @@
sudoersddir = $(sysconfdir)/sudoers.d
sudoersd_DATA = zfs
EXTRA_DIST = \
zfs
etc/systemd/Makefile.am
-1
View File
@@ -1 +0,0 @@
SUBDIRS = system system-generators
etc/systemd/system-generators/Makefile.am
-15
View File
@@ -1,15 +0,0 @@
include $(top_srcdir)/config/Rules.am
systemdgenerator_PROGRAMS = \
zfs-mount-generator
zfs_mount_generator_SOURCES = \
zfs-mount-generator.c
zfs_mount_generator_LDADD = \
$(abs_top_builddir)/libzfs.la
zfs_mount_generator_LDFLAGS = -pthread
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zfs-mount-generator
etc/systemd/system/.gitignore
-1
View File
@@ -1,4 +1,3 @@
*.service
*.target
*.preset
*.timer
etc/systemd/system/50-zfs.preset.in → etc/systemd/system/50-zfs.preset
View File
etc/systemd/system/Makefile.am
-26
View File
@@ -1,26 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
systemdpreset_DATA = \
50-zfs.preset
systemdunit_DATA = \
zfs-zed.service \
zfs-import-cache.service \
zfs-import-scan.service \
zfs-mount.service \
zfs-share.service \
zfs-volume-wait.service \
zfs-import.target \
zfs-volumes.target \
zfs.target \
zfs-scrub-monthly@.timer \
zfs-scrub-weekly@.timer \
zfs-scrub@.service
SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA)
install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
etc/zfs/Makefile.am
-21
View File
@@ -1,21 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
pkgsysconfdir = $(sysconfdir)/zfs
dist_pkgsysconf_DATA = \
vdev_id.conf.alias.example \
vdev_id.conf.sas_direct.example \
vdev_id.conf.sas_switch.example \
vdev_id.conf.multipath.example \
vdev_id.conf.scsi.example
pkgsysconf_SCRIPTS = \
zfs-functions
SUBSTFILES += $(pkgsysconf_SCRIPTS)
SHELLCHECK_SHELL = sh
SHELLCHECKSCRIPTS += $(pkgsysconf_SCRIPTS)