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

autoconf: use include directives instead of recursing down contrib

Browse Source 
Also make the pyzfs build actually out-of-tree and quiet by default

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Co-authored-by: Rapptz <rapptz@gmail.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб
2022-04-10 00:16:59 +02:00
committed by Brian Behlendorf
parent 674a9f3727
commit 50d2c9e4fd
21 changed files with 112 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/dracut/90zfs/.gitignore → contrib/dracut/.gitignore
View File
contrib/dracut/02zfsexpandknowledge/.gitignore
-1
View File
@@ -1 +0,0 @@
module-setup.sh
contrib/dracut/02zfsexpandknowledge/Makefile.am
-11
View File
@@ -1,11 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
pkgdracutdir = $(dracutdir)/modules.d/02zfsexpandknowledge
pkgdracut_SCRIPTS = \
module-setup.sh
SUBSTFILES += $(pkgdracut_SCRIPTS)
SHELLCHECKSCRIPTS += $(pkgdracut_SCRIPTS)
contrib/dracut/90zfs/Makefile.am
-27
View File
@@ -1,27 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
pkgdracutdir = $(dracutdir)/modules.d/90zfs
pkgdracut_SCRIPTS = \
export-zfs.sh \
module-setup.sh \
mount-zfs.sh \
parse-zfs.sh \
zfs-generator.sh \
zfs-load-key.sh \
zfs-needshutdown.sh \
zfs-lib.sh \
import-opts-generator.sh
pkgdracut_DATA = \
zfs-env-bootfs.service \
zfs-snapshot-bootfs.service \
zfs-rollback-bootfs.service
SUBSTFILES += $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)
# Provided by /bin/sleep, and, again, every implementation of that supports this
CHECKBASHISMS_IGNORE = -e 'sleep only takes one integer' -e 'sleep 0.'
SHELLCHECKSCRIPTS += $(pkgdracut_SCRIPTS)
contrib/dracut/Makefile.am
+25 -4
View File
@@ -1,6 +1,27 @@
include $(top_srcdir)/config/Shellcheck.am
pkgdracut_02dir = $(dracutdir)/modules.d/02zfsexpandknowledge
pkgdracut_02_SCRIPTS = \
%D%/02zfsexpandknowledge/module-setup.sh
SUBDIRS = 02zfsexpandknowledge 90zfs
SHELLCHECKDIRS = $(SUBDIRS)
pkgdracut_90dir = $(dracutdir)/modules.d/90zfs
pkgdracut_90_SCRIPTS = \
%D%/90zfs/export-zfs.sh \
%D%/90zfs/import-opts-generator.sh \
%D%/90zfs/module-setup.sh \
%D%/90zfs/mount-zfs.sh \
%D%/90zfs/parse-zfs.sh \
%D%/90zfs/zfs-generator.sh \
%D%/90zfs/zfs-lib.sh \
%D%/90zfs/zfs-load-key.sh \
%D%/90zfs/zfs-needshutdown.sh
EXTRA_DIST = README.md
pkgdracut_90_DATA = \
%D%/90zfs/zfs-env-bootfs.service \
%D%/90zfs/zfs-rollback-bootfs.service \
%D%/90zfs/zfs-snapshot-bootfs.service
SUBSTFILES += $(pkgdracut_02_SCRIPTS) $(pkgdracut_90_SCRIPTS) $(pkgdracut_90_DATA)
SHELLCHECKSCRIPTS += $(pkgdracut_02_SCRIPTS) $(pkgdracut_90_SCRIPTS)
# Provided by /bin/sleep, and, again, every implementation of that supports this
$(call SHELLCHECK_OPTS,$(pkgdracut_90_SCRIPTS)): CHECKBASHISMS_IGNORE = -e 'sleep only takes one integer' -e 'sleep 0.'
EXTRA_DIST += $(addprefix %D%/,README.md)