./autogen.sh
- name: Configure
run: |
- ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan
+ ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan --with-config=dist
- name: Make
run: |
make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod
./autogen.sh
- name: Configure
run: |
- ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan
+ ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan --with-config=dist
- name: Make
run: |
make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod
./autogen.sh
- name: Configure
run: |
- ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan
+ ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan --with-config=dist
- name: Make
run: |
make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod
CLEANFILES =
-EXTRA_DIST =
+dist_noinst_DATA =
INSTALL_DATA_HOOKS =
ALL_LOCAL =
CLEAN_LOCAL =
extra_HEADERS = zfs.release.in zfs_config.h.in
endif
-EXTRA_DIST += autogen.sh copy-builtin
-EXTRA_DIST += AUTHORS CODE_OF_CONDUCT.md COPYRIGHT LICENSE META NEWS NOTICE
-EXTRA_DIST += README.md RELEASES.md
-EXTRA_DIST += module/lua/README.zfs module/os/linux/spl/README.md
+dist_noinst_DATA += autogen.sh copy-builtin
+dist_noinst_DATA += AUTHORS CODE_OF_CONDUCT.md COPYRIGHT LICENSE META NEWS NOTICE
+dist_noinst_DATA += README.md RELEASES.md
+dist_noinst_DATA += module/lua/README.zfs module/os/linux/spl/README.md
# Include all the extra licensing information for modules
-EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE
-EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE.descrip
-EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
-EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
-EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
-EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
-EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
-EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams.descrip
-EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
-EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl.descrip
-EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2
-EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2.descrip
-EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash
-EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash.descrip
+dist_noinst_DATA += module/icp/algs/skein/THIRDPARTYLICENSE
+dist_noinst_DATA += module/icp/algs/skein/THIRDPARTYLICENSE.descrip
+dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
+dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
+dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
+dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
+dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
+dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams.descrip
+dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
+dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl.descrip
+dist_noinst_DATA += module/os/linux/spl/THIRDPARTYLICENSE.gplv2
+dist_noinst_DATA += module/os/linux/spl/THIRDPARTYLICENSE.gplv2.descrip
+dist_noinst_DATA += module/zfs/THIRDPARTYLICENSE.cityhash
+dist_noinst_DATA += module/zfs/THIRDPARTYLICENSE.cityhash.descrip
@CODE_COVERAGE_RULES@
sbin_SCRIPTS += fsck.zfs
SHELLCHECKSCRIPTS += fsck.zfs
CLEANFILES += fsck.zfs
-EXTRA_DIST += %D%/fsck.zfs.in
+dist_noinst_DATA += %D%/fsck.zfs.in
$(call SUBST,fsck.zfs,%D%/)
if USING_PYTHON
-bin_SCRIPTS += arc_summary arcstat dbufstat
-CLEANFILES += arc_summary arcstat dbufstat
-EXTRA_DIST += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in
+bin_SCRIPTS += arc_summary arcstat dbufstat
+CLEANFILES += arc_summary arcstat dbufstat
+dist_noinst_DATA += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in
$(call SUBST,arcstat,%D%/)
$(call SUBST,dbufstat,%D%/)
zed_LDADD += -lrt $(LIBATOMIC_LIBS) $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
zed_LDFLAGS = -pthread
-EXTRA_DIST += $(addprefix %D%/,agents/README.md)
+dist_noinst_DATA += %D%/agents/README.md
vdev_attach-led.sh \
vdev_clear-led.sh
-EXTRA_DIST += $(addprefix %D%/,README)
+dist_noinst_DATA += %D%/README
INSTALL_DATA_HOOKS += zed-install-data-hook
zed-install-data-hook:
endif
zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS)
-EXTRA_DIST += $(addprefix %D%/,zpool.d/README compatibility.d)
+dist_noinst_DATA += %D%/zpool.d/README
SHELLCHECKSCRIPTS += $(dist_zpoolexec_SCRIPTS)
zpoolexecdir = $(zfsexecdir)/zpool.d
SUBSTFILES =
CLEANFILES += $(SUBSTFILES)
-EXTRA_DIST += $(SUBSTFILES:=.in)
+dist_noinst_DATA += $(SUBSTFILES:=.in)
$(call SUBST,%,)
user) ZFS_AC_CONFIG_USER ;;
all) ZFS_AC_CONFIG_USER
ZFS_AC_CONFIG_KERNEL ;;
+ dist) ;;
srpm) ;;
*)
AC_MSG_RESULT([Error!])
-EXTRA_DIST += $(addprefix %D%/, \
- taskqlatency.bt \
- zfs-trace.sh)
+dist_noinst_DATA += %D%/taskqlatency.bt %D%/zfs-trace.sh
SHELLCHECKSCRIPTS += %D%/zfs-trace.sh
# 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)
+dist_noinst_DATA += %D%/README.md
$(call SHELLCHECK_OPTS,$(i_t_check_scripts)): SHELLCHECK_SHELL = sh
-EXTRA_DIST += $(addprefix %D%/,README.md)
+dist_noinst_DATA += %D%/README.md
-EXTRA_DIST += $(addprefix %D%/,libzfs_core README LICENSE docs)
+dist_noinst_DATA += %D%/libzfs_core %D%/README %D%/LICENSE %D%/docs
SUBSTFILES += %D%/setup.py
if PYZFS_ENABLED
-EXTRA_DIST += $(addprefix %D%/,autosnap.lua)
+dist_noinst_DATA += %D%/autosnap.lua
sudoersd_DATA = \
%D%/sudoers.d/zfs
-EXTRA_DIST += $(sudoersd_DATA)
+dist_noinst_DATA += $(sudoersd_DATA)
sysconf_zfsdir = $(sysconfdir)/zfs
if INIT_SYSV
-EXTRA_DIST += $(addprefix %D%/,init.d/README.md)
+dist_noinst_DATA += %D%/init.d/README.md
init_SCRIPTS = \
%D%/init.d/zfs-import \
libnvpair_la_LDFLAGS += -version-info 3:0:0
-EXTRA_DIST += $(addprefix %D%/,libnvpair.abi libnvpair.suppr)
+dist_noinst_DATA += %D%/libnvpair.abi %D%/libnvpair.suppr
libuutil_la_LDFLAGS += -version-info 3:0:0
-EXTRA_DIST += $(addprefix %D%/,libuutil.abi libuutil.suppr)
+dist_noinst_DATA += %D%/libuutil.abi %D%/libuutil.suppr
pkgconfig_DATA += %D%/libzfs.pc
-EXTRA_DIST += $(addprefix %D%/,libzfs.abi libzfs.suppr)
-EXTRA_DIST += $(addprefix %D%/,THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip)
+dist_noinst_DATA += %D%/libzfs.abi %D%/libzfs.suppr
+dist_noinst_DATA += %D%/THIRDPARTYLICENSE.openssl %D%/THIRDPARTYLICENSE.openssl.descrip
pkgconfig_DATA += %D%/libzfs_core.pc
-EXTRA_DIST += $(addprefix %D%/,libzfs_core.abi libzfs_core.suppr)
+dist_noinst_DATA += %D%/libzfs_core.abi %D%/libzfs_core.suppr
pkgconfig_DATA += %D%/libzfsbootenv.pc
-EXTRA_DIST += $(addprefix %D%/,libzfsbootenv.abi libzfsbootenv.suppr)
+dist_noinst_DATA += %D%/libzfsbootenv.abi %D%/libzfsbootenv.suppr
-EXTRA_DIST += \
+dist_noinst_man_MANS = \
%D%/man1/cstyle.1
dist_man_MANS = \
%D%/man8/zed.8 \
%D%/man8/zfs-mount-generator.8
-SUBSTFILES += $(nodist_man_MANS)
+dist_noinst_DATA += $(dist_noinst_man_MANS) $(dist_man_MANS)
+SUBSTFILES += $(nodist_man_MANS)
CHECKS += mancheck
mancheck:
-EXTRA_DIST += \
+dist_noinst_DATA += \
%D%/generic/zfs-dkms.spec.in \
%D%/generic/zfs-kmod.spec.in \
%D%/generic/zfs.spec.in \
%D%/zimport.sh \
%D%/zloop.sh
-EXTRA_SCRIPTS = \
+dist_noinst_SCRIPTS = \
%D%/commitcheck.sh \
%D%/common.sh.in \
%D%/dkms.mkconf \
%D%/paxcheck.sh \
%D%/zfs-tests-color.sh
-EXTRA_DIST += \
+dist_noinst_DATA += \
%D%/cstyle.pl \
%D%/enum-extract.pl \
%D%/zfs2zol-patch.sed \
- %D%/zol2zfs-patch.sed \
- $(EXTRA_SCRIPTS)
+ %D%/zol2zfs-patch.sed
-SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS) $(EXTRA_SCRIPTS)
+SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS) $(dist_noinst_SCRIPTS)
define SCRIPTS_EXTRA_ENVIRONMENT
%D%/runfiles/sunos.run
-EXTRA_DIST += $(addprefix %D%/,README.md)
+dist_noinst_DATA += %D%/README.md
SHELLCHECKSCRIPTS += $(shell find $(srcdir)/%D% -name '*.sh')
libnvpair.la
%C%_draid_LDADD += $(ZLIB_LIBS)
-EXTRA_DIST += $(addprefix %D%/,file/file_common.h)
+dist_noinst_DATA += %D%/file/file_common.h
scripts_zfs_tests_bin_PROGRAMS += %D%/file_append %D%/file_check %D%/file_trunc %D%/file_write %D%/largest_file %D%/randwritecomp
%C%_file_append_SOURCES = %D%/file/file_append.c
%C%_file_check_SOURCES = %D%/file/file_check.c
scripts_zfs_tests_bin_PROGRAMS += %D%/zed_fd_spill-zedlet
-EXTRA_DIST += $(addprefix %D%/,linux_dos_attributes/dos_attributes.h)
+dist_noinst_DATA += %D%/linux_dos_attributes/dos_attributes.h
scripts_zfs_tests_bin_PROGRAMS += %D%/read_dos_attributes %D%/write_dos_attributes
%C%_read_dos_attributes_SOURCES = %D%/linux_dos_attributes/read_dos_attributes.c
%C%_write_dos_attributes_SOURCES = %D%/linux_dos_attributes/write_dos_attributes.c
CLEANFILES =
-EXTRA_DIST =
+dist_noinst_DATA =
include $(top_srcdir)/config/Substfiles.am