summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorнаб <[email protected]>2022-04-09 04:09:55 +0200
committerBrian Behlendorf <[email protected]>2022-05-10 10:18:38 -0700
commit5cdca5b1da7884c54260db473f892354bc79951b (patch)
tree6bdce13ac507fd450359dde2b3fa10405a480c54 /contrib
parent3ff81c460114e0b3f69a9993d4777ec2c590fb16 (diff)
autoconf: use include directives instead of recursing down cmd
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 <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #13316
Diffstat (limited to 'contrib')
-rw-r--r--contrib/bash_completion.d/Makefile.am4
-rw-r--r--contrib/bpftrace/Makefile.am2
-rw-r--r--contrib/dracut/02zfsexpandknowledge/Makefile.am3
-rw-r--r--contrib/dracut/90zfs/Makefile.am3
-rw-r--r--contrib/initramfs/Makefile.am2
-rw-r--r--contrib/initramfs/hooks/Makefile.am3
-rw-r--r--contrib/initramfs/scripts/Makefile.am1
-rw-r--r--contrib/initramfs/scripts/local-top/Makefile.am3
8 files changed, 17 insertions, 4 deletions
diff --git a/contrib/bash_completion.d/Makefile.am b/contrib/bash_completion.d/Makefile.am
index eee617802..0295843eb 100644
--- a/contrib/bash_completion.d/Makefile.am
+++ b/contrib/bash_completion.d/Makefile.am
@@ -1,3 +1,5 @@
+CLEANFILES =
+EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
@@ -8,5 +10,5 @@ noinst_DATA = zfs
EXTRA_DIST += $(noinst_DATA)
SUBSTFILES += $(noinst_DATA)
-SHELLCHECKSCRIPTS = $(noinst_DATA)
+SHELLCHECKSCRIPTS += $(noinst_DATA)
SHELLCHECK_SHELL = bash
diff --git a/contrib/bpftrace/Makefile.am b/contrib/bpftrace/Makefile.am
index 05e4f1c50..7194ec689 100644
--- a/contrib/bpftrace/Makefile.am
+++ b/contrib/bpftrace/Makefile.am
@@ -4,4 +4,4 @@ EXTRA_DIST = \
taskqlatency.bt \
zfs-trace.sh
-SHELLCHECKSCRIPTS = zfs-trace.sh
+SHELLCHECKSCRIPTS += zfs-trace.sh
diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.am b/contrib/dracut/02zfsexpandknowledge/Makefile.am
index b1bbb6bd3..23fcc0a3c 100644
--- a/contrib/dracut/02zfsexpandknowledge/Makefile.am
+++ b/contrib/dracut/02zfsexpandknowledge/Makefile.am
@@ -1,3 +1,5 @@
+CLEANFILES =
+EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
@@ -6,3 +8,4 @@ pkgdracut_SCRIPTS = \
module-setup.sh
SUBSTFILES += $(pkgdracut_SCRIPTS)
+SHELLCHECKSCRIPTS += $(pkgdracut_SCRIPTS)
diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am
index 3f7050300..28bedfb39 100644
--- a/contrib/dracut/90zfs/Makefile.am
+++ b/contrib/dracut/90zfs/Makefile.am
@@ -1,3 +1,5 @@
+CLEANFILES =
+EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
@@ -22,3 +24,4 @@ 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)
diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index 57e8f5c3a..5ee8e16a0 100644
--- a/contrib/initramfs/Makefile.am
+++ b/contrib/initramfs/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/config/Shellcheck.am
initrddir = /usr/share/initramfs-tools
dist_initrd_SCRIPTS = \
- zfsunlock
+ zfsunlock
SUBDIRS = conf.d conf-hooks.d hooks scripts
SHELLCHECKDIRS = hooks scripts
diff --git a/contrib/initramfs/hooks/Makefile.am b/contrib/initramfs/hooks/Makefile.am
index 0cd1aafcd..e872c0a00 100644
--- a/contrib/initramfs/hooks/Makefile.am
+++ b/contrib/initramfs/hooks/Makefile.am
@@ -1,3 +1,5 @@
+CLEANFILES =
+EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am
@@ -8,3 +10,4 @@ hooks_SCRIPTS = \
zfsunlock
SUBSTFILES += $(hooks_SCRIPTS)
+SHELLCHECKSCRIPTS += $(hooks_SCRIPTS)
diff --git a/contrib/initramfs/scripts/Makefile.am b/contrib/initramfs/scripts/Makefile.am
index 444a5f374..8b48f2056 100644
--- a/contrib/initramfs/scripts/Makefile.am
+++ b/contrib/initramfs/scripts/Makefile.am
@@ -9,3 +9,4 @@ SUBDIRS = local-top
SHELLCHECKDIRS = $(SUBDIRS)
SHELLCHECK_SHELL = sh
+SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS)
diff --git a/contrib/initramfs/scripts/local-top/Makefile.am b/contrib/initramfs/scripts/local-top/Makefile.am
index f3dc23129..f64665f4b 100644
--- a/contrib/initramfs/scripts/local-top/Makefile.am
+++ b/contrib/initramfs/scripts/local-top/Makefile.am
@@ -3,5 +3,6 @@ include $(top_srcdir)/config/Shellcheck.am
localtopdir = /usr/share/initramfs-tools/scripts/local-top
dist_localtop_SCRIPTS = \
- zfs
+ zfs
+SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS)