Skip to content

Commit

Permalink
Process script directory for all configs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
szubersk authored Oct 27, 2022
1 parent 4d631a5 commit 1428ede
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ include $(top_srcdir)/config/Rules.am
include $(top_srcdir)/config/CppCheck.am
include $(top_srcdir)/config/Shellcheck.am
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/scripts/Makefile.am

ACLOCAL_AMFLAGS = -I config

Expand All @@ -23,7 +24,6 @@ include $(srcdir)/%D%/contrib/Makefile.am
include $(srcdir)/%D%/etc/Makefile.am
include $(srcdir)/%D%/lib/Makefile.am
include $(srcdir)/%D%/man/Makefile.am
include $(srcdir)/%D%/scripts/Makefile.am
include $(srcdir)/%D%/tests/Makefile.am
if BUILD_LINUX
include $(srcdir)/%D%/udev/Makefile.am
Expand Down
20 changes: 13 additions & 7 deletions scripts/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
scriptsdir = $(datadir)/$(PACKAGE)
dist_scripts_SCRIPTS = \
%D%/zfs-helpers.sh \
%D%/zfs-tests.sh \
%D%/zfs.sh \
%D%/zimport.sh \
%D%/zloop.sh

dist_noinst_SCRIPTS = \
%D%/commitcheck.sh \
%D%/common.sh.in \
Expand All @@ -18,6 +11,19 @@ dist_noinst_SCRIPTS = \
%D%/paxcheck.sh \
%D%/zfs-tests-color.sh

scripts_scripts = \
%D%/zfs-helpers.sh \
%D%/zfs-tests.sh \
%D%/zfs.sh \
%D%/zimport.sh \
%D%/zloop.sh

if CONFIG_USER
dist_scripts_SCRIPTS = $(scripts_scripts)
else
dist_noinst_SCRIPTS += $(scripts_scripts)
endif

dist_noinst_DATA += \
%D%/cstyle.pl \
%D%/enum-extract.pl \
Expand Down

0 comments on commit 1428ede

Please sign in to comment.