diff options
| author | Tony Hutter <[email protected]> | 2018-04-06 16:34:21 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-04-06 16:34:21 -0700 |
| commit | 6c9af9e8f4a2901c9a5f205876b67dcc3216cbd8 (patch) | |
| tree | 3661a51d97353707054e508a0171a26ec75d827b /contrib | |
| parent | 812323bb03ce4c31f61bfb83d70eb1f5c494df25 (diff) | |
Fix "file is executable, but no shebang" warnings
Fedora 28's RPM build checks warn when executable files don't have a
shebang line. These warnings are caused when we (incorrectly)
include data & config files in the_SCRIPTS automake lines. Files in
_SCRIPTS are marked executable by automake. This patch fixes the
issue by including non-executable scripts in a _DATA line instead.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Closes #7359
Closes #7395
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/initramfs/scripts/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/initramfs/scripts/Makefile.am b/contrib/initramfs/scripts/Makefile.am index 7b65429fd..a550311cd 100644 --- a/contrib/initramfs/scripts/Makefile.am +++ b/contrib/initramfs/scripts/Makefile.am @@ -1,6 +1,6 @@ scriptsdir = $(datarootdir)/initramfs-tools/scripts -scripts_SCRIPTS = \ +scripts_DATA = \ zfs SUBDIRS = local-top @@ -8,7 +8,7 @@ SUBDIRS = local-top EXTRA_DIST = \ $(top_srcdir)/contrib/initramfs/scripts/zfs.in -$(scripts_SCRIPTS):%:%.in +$(scripts_DATA):%:%.in -$(SED) -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< >'$@' |