mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-19 02:41:00 +03:00
d98a67a53a
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
56 lines
1.7 KiB
Makefile
56 lines
1.7 KiB
Makefile
zedconfdir = $(sysconfdir)/zfs/zed.d
|
|
dist_zedconf_DATA = \
|
|
%D%/zed-functions.sh \
|
|
%D%/zed.rc
|
|
|
|
zedexecdir = $(zfsexecdir)/zed.d
|
|
|
|
dist_zedexec_SCRIPTS = \
|
|
%D%/all-debug.sh \
|
|
%D%/all-syslog.sh \
|
|
%D%/data-notify.sh \
|
|
%D%/generic-notify.sh \
|
|
%D%/pool_import-led.sh \
|
|
%D%/resilver_finish-notify.sh \
|
|
%D%/resilver_finish-start-scrub.sh \
|
|
%D%/scrub_finish-notify.sh \
|
|
%D%/statechange-led.sh \
|
|
%D%/statechange-notify.sh \
|
|
%D%/trim_finish-notify.sh \
|
|
%D%/vdev_attach-led.sh \
|
|
%D%/vdev_clear-led.sh
|
|
|
|
nodist_zedexec_SCRIPTS = \
|
|
%D%/history_event-zfs-list-cacher.sh
|
|
|
|
SUBSTFILES += $(nodist_zedexec_SCRIPTS)
|
|
|
|
zedconfdefaults = \
|
|
all-syslog.sh \
|
|
data-notify.sh \
|
|
history_event-zfs-list-cacher.sh \
|
|
pool_import-led.sh \
|
|
resilver_finish-notify.sh \
|
|
resilver_finish-start-scrub.sh \
|
|
scrub_finish-notify.sh \
|
|
statechange-led.sh \
|
|
statechange-notify.sh \
|
|
vdev_attach-led.sh \
|
|
vdev_clear-led.sh
|
|
|
|
dist_noinst_DATA += %D%/README
|
|
|
|
INSTALL_DATA_HOOKS += zed-install-data-hook
|
|
zed-install-data-hook:
|
|
$(MKDIR_P) "$(DESTDIR)$(zedconfdir)"
|
|
set -x; for f in $(zedconfdefaults); do \
|
|
[ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
|
|
[ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
|
|
$(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
|
|
done
|
|
|
|
SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)
|
|
$(call SHELLCHECK_OPTS,$(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)): SHELLCHECK_SHELL = sh
|
|
# False positive: 1>&"${ZED_FLOCK_FD}" looks suspiciously similar to a >&filename bash extension
|
|
$(call SHELLCHECK_OPTS,$(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)): CHECKBASHISMS_IGNORE = -e 'should be >word 2>&1' -e '&"$${ZED_FLOCK_FD}"'
|