diff options
| author | Arvind Sankar <[email protected]> | 2020-07-19 13:19:08 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-19 10:19:08 -0700 |
| commit | 5ad61b5b0153094ddc5f524800907973a8583d55 (patch) | |
| tree | b5f9ea8c7dc7e58e363146e0093b0efbe3831c16 /rpm | |
| parent | 0421f257b20f41e33fb69e067b47beed2c5bd3bd (diff) | |
Disable shebang mangling on input files
The DKMS module installs the entire source tree, including the .in files
that will later be substituted when building. This makes
brp_mangle_shebangs complain about shebang lines in the .in files.
Exclude everything under /usr/src from shebang mangling in the DKMS
package.
The KMOD package doesn't contain any of the files it excludes from
mangling, so just drop the exclusion.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: João Carlos Mendes Luís <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10581
Closes #10582
Diffstat (limited to 'rpm')
| -rw-r--r-- | rpm/generic/zfs-dkms.spec.in | 4 | ||||
| -rw-r--r-- | rpm/generic/zfs-kmod.spec.in | 3 | ||||
| -rw-r--r-- | rpm/redhat/zfs-kmod.spec.in | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in index 29e8fd7dd..5b05e1c33 100644 --- a/rpm/generic/zfs-dkms.spec.in +++ b/rpm/generic/zfs-dkms.spec.in @@ -4,8 +4,8 @@ %define not_rpm 1 %endif -# See comment in zfs.spec.in. -%global __brp_mangle_shebangs_exclude_from arc_summary.py|arcstat.py|dbufstat.py|test-runner.py|zts-report.py +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ %define module @PACKAGE@ %define mkconf scripts/dkms.mkconf diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in index 80b35a05f..bc033733a 100644 --- a/rpm/generic/zfs-kmod.spec.in +++ b/rpm/generic/zfs-kmod.spec.in @@ -1,8 +1,5 @@ %define module @PACKAGE@ -# See comment in zfs.spec.in. -%global __brp_mangle_shebangs_exclude_from arc_summary.py|arcstat.py|dbufstat.py|test-runner.py|zts-report.py - %if !%{defined ksrc} %if 0%{?rhel}%{?fedora} %define ksrc ${kernel_version##*___} diff --git a/rpm/redhat/zfs-kmod.spec.in b/rpm/redhat/zfs-kmod.spec.in index 3b566c7c5..6d928ec74 100644 --- a/rpm/redhat/zfs-kmod.spec.in +++ b/rpm/redhat/zfs-kmod.spec.in @@ -1,9 +1,6 @@ %bcond_with debug %bcond_with debuginfo -# See comment in zfs.spec.in. -%global __brp_mangle_shebangs_exclude_from arc_summary.py|arcstat.py|dbufstat.py|test-runner.py|zts-report.py - Name: @PACKAGE@-kmod Version: @VERSION@ Release: @RELEASE@%{?dist} |