Skip to content

Commit 1428ede

Browse files
authoredOct 27, 2022
Process script directory for all configs
Even when only building kmods process the scripts directory. This way the common.sh script will be generated and the zfs.sh script can be used to load/unload the in-tree kernel modules. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: szubersk <[email protected]> Closes #14027 Closes #14051
1 parent 4d631a5 commit 1428ede

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed
 

‎Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ include $(top_srcdir)/config/Rules.am
99
include $(top_srcdir)/config/CppCheck.am
1010
include $(top_srcdir)/config/Shellcheck.am
1111
include $(top_srcdir)/config/Substfiles.am
12+
include $(top_srcdir)/scripts/Makefile.am
1213

1314
ACLOCAL_AMFLAGS = -I config
1415

@@ -23,7 +24,6 @@ include $(srcdir)/%D%/contrib/Makefile.am
2324
include $(srcdir)/%D%/etc/Makefile.am
2425
include $(srcdir)/%D%/lib/Makefile.am
2526
include $(srcdir)/%D%/man/Makefile.am
26-
include $(srcdir)/%D%/scripts/Makefile.am
2727
include $(srcdir)/%D%/tests/Makefile.am
2828
if BUILD_LINUX
2929
include $(srcdir)/%D%/udev/Makefile.am

‎scripts/Makefile.am

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
scriptsdir = $(datadir)/$(PACKAGE)
2-
dist_scripts_SCRIPTS = \
3-
%D%/zfs-helpers.sh \
4-
%D%/zfs-tests.sh \
5-
%D%/zfs.sh \
6-
%D%/zimport.sh \
7-
%D%/zloop.sh
8-
92
dist_noinst_SCRIPTS = \
103
%D%/commitcheck.sh \
114
%D%/common.sh.in \
@@ -18,6 +11,19 @@ dist_noinst_SCRIPTS = \
1811
%D%/paxcheck.sh \
1912
%D%/zfs-tests-color.sh
2013

14+
scripts_scripts = \
15+
%D%/zfs-helpers.sh \
16+
%D%/zfs-tests.sh \
17+
%D%/zfs.sh \
18+
%D%/zimport.sh \
19+
%D%/zloop.sh
20+
21+
if CONFIG_USER
22+
dist_scripts_SCRIPTS = $(scripts_scripts)
23+
else
24+
dist_noinst_SCRIPTS += $(scripts_scripts)
25+
endif
26+
2127
dist_noinst_DATA += \
2228
%D%/cstyle.pl \
2329
%D%/enum-extract.pl \

0 commit comments

Comments
 (0)
Please sign in to comment.