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
27 changed files with 56 additions and 57 deletions
+1 -3
View File
@@ -1,5 +1,3 @@
EXTRA_DIST += $(addprefix %D%/, \
taskqlatency.bt \
zfs-trace.sh)
dist_noinst_DATA += %D%/taskqlatency.bt %D%/zfs-trace.sh
SHELLCHECKSCRIPTS += %D%/zfs-trace.sh
+1 -1
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
$(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
+1 -1
View File
@@ -36,4 +36,4 @@ SHELLCHECKSCRIPTS += $(i_t_check_scripts)
$(call SHELLCHECK_OPTS,$(i_t_check_scripts)): SHELLCHECK_SHELL = sh
EXTRA_DIST += $(addprefix %D%/,README.md)
dist_noinst_DATA += %D%/README.md
+1 -1
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
if PYZFS_ENABLED
+1 -1
View File
@@ -1 +1 @@
EXTRA_DIST += $(addprefix %D%/,autosnap.lua)
dist_noinst_DATA += %D%/autosnap.lua