c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-24 18:39:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Process script directory for all configs

Browse Source 
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 <behlendorf1@llnl.gov>
Signed-off-by: szubersk <szuberskidamian@gmail.com>
Closes #14027
Closes #14051
This commit is contained in:
Damian Szuberski 2022-10-28 09:45:14 +10:00 committed by GitHub
parent 4d631a509d
commit 1428ede0ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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
@ -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

20
scripts/Makefile.am
View File

@ -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 \
@ -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 \