Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Replace EXTRA_DIST with dist_noinst_DATA 

The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #13459
Closes #13505
This commit is contained in:
Brian Behlendorf 2022-05-26 09:24:50 -07:00 committed by GitHub
parent b62829295e
commit d98a67a53a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/zfs-tests-functional.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
./autogen.sh ./autogen.sh
- name: Configure - name: Configure
run: | run: |
./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan --with-config=dist
- name: Make - name: Make
run: | run: |
make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod

2
.github/workflows/zfs-tests-sanity.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
./autogen.sh ./autogen.sh
- name: Configure - name: Configure
run: | run: |
./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan --with-config=dist
- name: Make - name: Make
run: | run: |
make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod

2
.github/workflows/zloop.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
./autogen.sh ./autogen.sh
- name: Configure - name: Configure
run: | run: |
./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan --with-config=dist
- name: Make - name: Make
run: | run: |
make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod

38
Makefile.am
View File

@ -1,5 +1,5 @@
CLEANFILES = CLEANFILES =
EXTRA_DIST = dist_noinst_DATA =
INSTALL_DATA_HOOKS = INSTALL_DATA_HOOKS =
ALL_LOCAL = ALL_LOCAL =
CLEAN_LOCAL = CLEAN_LOCAL =
@ -37,26 +37,26 @@ extradir = $(prefix)/src/zfs-$(VERSION)
extra_HEADERS = zfs.release.in zfs_config.h.in extra_HEADERS = zfs.release.in zfs_config.h.in
endif endif
EXTRA_DIST += autogen.sh copy-builtin dist_noinst_DATA += autogen.sh copy-builtin
EXTRA_DIST += AUTHORS CODE_OF_CONDUCT.md COPYRIGHT LICENSE META NEWS NOTICE dist_noinst_DATA += AUTHORS CODE_OF_CONDUCT.md COPYRIGHT LICENSE META NEWS NOTICE
EXTRA_DIST += README.md RELEASES.md dist_noinst_DATA += README.md RELEASES.md
EXTRA_DIST += module/lua/README.zfs module/os/linux/spl/README.md dist_noinst_DATA += module/lua/README.zfs module/os/linux/spl/README.md
# Include all the extra licensing information for modules # Include all the extra licensing information for modules
EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE dist_noinst_DATA += module/icp/algs/skein/THIRDPARTYLICENSE
EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE.descrip dist_noinst_DATA += module/icp/algs/skein/THIRDPARTYLICENSE.descrip
EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams.descrip dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams.descrip
EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl.descrip dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl.descrip
EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2 dist_noinst_DATA += module/os/linux/spl/THIRDPARTYLICENSE.gplv2
EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2.descrip dist_noinst_DATA += module/os/linux/spl/THIRDPARTYLICENSE.gplv2.descrip
EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash dist_noinst_DATA += module/zfs/THIRDPARTYLICENSE.cityhash
EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash.descrip dist_noinst_DATA += module/zfs/THIRDPARTYLICENSE.cityhash.descrip
@CODE_COVERAGE_RULES@ @CODE_COVERAGE_RULES@

4
cmd/Makefile.am
View File

@ -10,7 +10,7 @@ mounthelper_PROGRAMS =
sbin_SCRIPTS += fsck.zfs sbin_SCRIPTS += fsck.zfs
SHELLCHECKSCRIPTS += fsck.zfs SHELLCHECKSCRIPTS += fsck.zfs
CLEANFILES += fsck.zfs CLEANFILES += fsck.zfs
EXTRA_DIST += %D%/fsck.zfs.in dist_noinst_DATA += %D%/fsck.zfs.in
$(call SUBST,fsck.zfs,%D%/) $(call SUBST,fsck.zfs,%D%/)
@ -102,7 +102,7 @@ endif
if USING_PYTHON if USING_PYTHON
bin_SCRIPTS += arc_summary arcstat dbufstat bin_SCRIPTS += arc_summary arcstat dbufstat
CLEANFILES += arc_summary arcstat dbufstat CLEANFILES += arc_summary arcstat dbufstat
EXTRA_DIST += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in dist_noinst_DATA += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in
$(call SUBST,arcstat,%D%/) $(call SUBST,arcstat,%D%/)
$(call SUBST,dbufstat,%D%/) $(call SUBST,dbufstat,%D%/)

2
cmd/zed/Makefile.am
View File

@ -43,4 +43,4 @@ zed_LDADD = \
zed_LDADD += -lrt $(LIBATOMIC_LIBS) $(LIBUDEV_LIBS) $(LIBUUID_LIBS) zed_LDADD += -lrt $(LIBATOMIC_LIBS) $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
zed_LDFLAGS = -pthread zed_LDFLAGS = -pthread
EXTRA_DIST += $(addprefix %D%/,agents/README.md) dist_noinst_DATA += %D%/agents/README.md

2
cmd/zed/zed.d/Makefile.am
View File

@ -38,7 +38,7 @@ zedconfdefaults = \
vdev_attach-led.sh \ vdev_attach-led.sh \
vdev_clear-led.sh vdev_clear-led.sh
EXTRA_DIST += $(addprefix %D%/,README) dist_noinst_DATA += %D%/README
INSTALL_DATA_HOOKS += zed-install-data-hook INSTALL_DATA_HOOKS += zed-install-data-hook
zed-install-data-hook: zed-install-data-hook:

2
cmd/zpool/Makefile.am
View File

@ -38,7 +38,7 @@ zpool_LDADD += -lgeom
endif endif
zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS) 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) SHELLCHECKSCRIPTS += $(dist_zpoolexec_SCRIPTS)
zpoolexecdir = $(zfsexecdir)/zpool.d zpoolexecdir = $(zfsexecdir)/zpool.d

2
config/Substfiles.am
View File

@ -41,6 +41,6 @@ endef
SUBSTFILES = SUBSTFILES =
CLEANFILES += $(SUBSTFILES) CLEANFILES += $(SUBSTFILES)
EXTRA_DIST += $(SUBSTFILES:=.in) dist_noinst_DATA += $(SUBSTFILES:=.in)
$(call SUBST,%,) $(call SUBST,%,)

1
config/zfs-build.m4
View File

@ -268,6 +268,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
user) ZFS_AC_CONFIG_USER ;; user) ZFS_AC_CONFIG_USER ;;
all) ZFS_AC_CONFIG_USER all) ZFS_AC_CONFIG_USER
ZFS_AC_CONFIG_KERNEL ;; ZFS_AC_CONFIG_KERNEL ;;
dist) ;;
srpm) ;; srpm) ;;
*) *)
AC_MSG_RESULT([Error!]) AC_MSG_RESULT([Error!])

4
contrib/bpftrace/Makefile.am
View File

@ -1,5 +1,3 @@
EXTRA_DIST += $(addprefix %D%/, \ dist_noinst_DATA += %D%/taskqlatency.bt %D%/zfs-trace.sh
taskqlatency.bt \
zfs-trace.sh)
SHELLCHECKSCRIPTS += %D%/zfs-trace.sh SHELLCHECKSCRIPTS += %D%/zfs-trace.sh

2
contrib/dracut/Makefile.am
View File

@ -24,4 +24,4 @@ SHELLCHECKSCRIPTS += $(pkgdracut_02_SCRIPTS) $(pkgdracut_90_SCRIPTS)
# Provided by /bin/sleep, and, again, every implementation of that supports this # 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.' $(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

2
contrib/initramfs/Makefile.am
View File

@ -36,4 +36,4 @@ SHELLCHECKSCRIPTS += $(i_t_check_scripts)
$(call SHELLCHECK_OPTS,$(i_t_check_scripts)): SHELLCHECK_SHELL = sh $(call SHELLCHECK_OPTS,$(i_t_check_scripts)): SHELLCHECK_SHELL = sh
EXTRA_DIST += $(addprefix %D%/,README.md) dist_noinst_DATA += %D%/README.md

2
contrib/pyzfs/Makefile.am
View File

@ -1,4 +1,4 @@
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 SUBSTFILES += %D%/setup.py
if PYZFS_ENABLED if PYZFS_ENABLED

2
contrib/zcp/Makefile.am
View File

@ -1 +1 @@
EXTRA_DIST += $(addprefix %D%/,autosnap.lua) dist_noinst_DATA += %D%/autosnap.lua

4
etc/Makefile.am
View File

@ -2,7 +2,7 @@ sudoersddir = $(sysconfdir)/sudoers.d
sudoersd_DATA = \ sudoersd_DATA = \
%D%/sudoers.d/zfs %D%/sudoers.d/zfs
EXTRA_DIST += $(sudoersd_DATA) dist_noinst_DATA += $(sudoersd_DATA)
sysconf_zfsdir = $(sysconfdir)/zfs sysconf_zfsdir = $(sysconfdir)/zfs
@ -32,7 +32,7 @@ $(call SHELLCHECK_OPTS,$(initconf_DATA)): SHELLCHECK_SHELL = sh
if INIT_SYSV if INIT_SYSV
EXTRA_DIST += $(addprefix %D%/,init.d/README.md) dist_noinst_DATA += %D%/init.d/README.md
init_SCRIPTS = \ init_SCRIPTS = \
%D%/init.d/zfs-import \ %D%/init.d/zfs-import \

2
lib/libnvpair/Makefile.am
View File

@ -32,4 +32,4 @@ endif
libnvpair_la_LDFLAGS += -version-info 3:0:0 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

2
lib/libuutil/Makefile.am
View File

@ -26,4 +26,4 @@ endif
libuutil_la_LDFLAGS += -version-info 3:0:0 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

4
lib/libzfs/Makefile.am
View File

@ -76,5 +76,5 @@ libzfs_la_LDFLAGS += -version-info 5:0:1
pkgconfig_DATA += %D%/libzfs.pc pkgconfig_DATA += %D%/libzfs.pc
EXTRA_DIST += $(addprefix %D%/,libzfs.abi libzfs.suppr) dist_noinst_DATA += %D%/libzfs.abi %D%/libzfs.suppr
EXTRA_DIST += $(addprefix %D%/,THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip) dist_noinst_DATA += %D%/THIRDPARTYLICENSE.openssl %D%/THIRDPARTYLICENSE.openssl.descrip

2
lib/libzfs_core/Makefile.am
View File

@ -43,4 +43,4 @@ libzfs_core_la_LDFLAGS += -version-info 3:0:0
pkgconfig_DATA += %D%/libzfs_core.pc 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

2
lib/libzfsbootenv/Makefile.am
View File

@ -26,4 +26,4 @@ libzfsbootenv_la_LDFLAGS += -version-info 1:0:0
pkgconfig_DATA += %D%/libzfsbootenv.pc pkgconfig_DATA += %D%/libzfsbootenv.pc
EXTRA_DIST += $(addprefix %D%/,libzfsbootenv.abi libzfsbootenv.suppr) dist_noinst_DATA += %D%/libzfsbootenv.abi %D%/libzfsbootenv.suppr

5
man/Makefile.am
View File

@ -1,4 +1,4 @@
EXTRA_DIST += \ dist_noinst_man_MANS = \
%D%/man1/cstyle.1 %D%/man1/cstyle.1
dist_man_MANS = \ dist_man_MANS = \
@ -105,8 +105,9 @@ nodist_man_MANS = \
%D%/man8/zed.8 \ %D%/man8/zed.8 \
%D%/man8/zfs-mount-generator.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 CHECKS += mancheck
mancheck: mancheck:

2
rpm/Makefile.am
View File

@ -1,4 +1,4 @@
EXTRA_DIST += \ dist_noinst_DATA += \
%D%/generic/zfs-dkms.spec.in \ %D%/generic/zfs-dkms.spec.in \
%D%/generic/zfs-kmod.spec.in \ %D%/generic/zfs-kmod.spec.in \
%D%/generic/zfs.spec.in \ %D%/generic/zfs.spec.in \

9
scripts/Makefile.am
View File

@ -6,7 +6,7 @@ dist_scripts_SCRIPTS = \
%D%/zimport.sh \ %D%/zimport.sh \
%D%/zloop.sh %D%/zloop.sh
EXTRA_SCRIPTS = \ dist_noinst_SCRIPTS = \
%D%/commitcheck.sh \ %D%/commitcheck.sh \
%D%/common.sh.in \ %D%/common.sh.in \
%D%/dkms.mkconf \ %D%/dkms.mkconf \
@ -18,14 +18,13 @@ EXTRA_SCRIPTS = \
%D%/paxcheck.sh \ %D%/paxcheck.sh \
%D%/zfs-tests-color.sh %D%/zfs-tests-color.sh
EXTRA_DIST += \ dist_noinst_DATA += \
%D%/cstyle.pl \ %D%/cstyle.pl \
%D%/enum-extract.pl \ %D%/enum-extract.pl \
%D%/zfs2zol-patch.sed \ %D%/zfs2zol-patch.sed \
%D%/zol2zfs-patch.sed \ %D%/zol2zfs-patch.sed
$(EXTRA_SCRIPTS)
SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS) $(EXTRA_SCRIPTS) SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS) $(dist_noinst_SCRIPTS)
define SCRIPTS_EXTRA_ENVIRONMENT define SCRIPTS_EXTRA_ENVIRONMENT

2
tests/Makefile.am
View File

@ -25,6 +25,6 @@ dist_scripts_runfiles_DATA = \
%D%/runfiles/sunos.run %D%/runfiles/sunos.run
EXTRA_DIST += $(addprefix %D%/,README.md) dist_noinst_DATA += %D%/README.md
SHELLCHECKSCRIPTS += $(shell find $(srcdir)/%D% -name '*.sh') SHELLCHECKSCRIPTS += $(shell find $(srcdir)/%D% -name '*.sh')

4
tests/zfs-tests/cmd/Makefile.am
View File

@ -41,7 +41,7 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/draid
libnvpair.la libnvpair.la
%C%_draid_LDADD += $(ZLIB_LIBS) %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 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_append_SOURCES = %D%/file/file_append.c
%C%_file_check_SOURCES = %D%/file/file_check.c %C%_file_check_SOURCES = %D%/file/file_check.c
@ -116,7 +116,7 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/xattrtest
scripts_zfs_tests_bin_PROGRAMS += %D%/zed_fd_spill-zedlet 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 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%_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 %C%_write_dos_attributes_SOURCES = %D%/linux_dos_attributes/write_dos_attributes.c

2
tests/zfs-tests/tests/Makefile.am
View File

@ -1,5 +1,5 @@
CLEANFILES = CLEANFILES =
EXTRA_DIST = dist_noinst_DATA =
include $(top_srcdir)/config/Substfiles.am include $(top_srcdir)/config/Substfiles.am