rpms/kernel
7
2
Fork 4
Code Issues Pull Requests Releases Activity

Drop Fedora checks around pathfix

Browse Source 
The el7 buildroot now has pathfix so we can drop these checks.
This commit is contained in:
Laura Abbott 2019-11-05 16:48:22 -05:00
parent 6f0f15962e
commit 4019404bbc
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel.spec
View File

@ -513,10 +513,8 @@ BuildRequires: kmod, patch, bash, tar, git-core
BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
BuildRequires: net-tools, hostname, bc, elfutils-devel, dwarves BuildRequires: net-tools, hostname, bc, elfutils-devel, dwarves
%if 0%{?fedora}
# Used to mangle unversioned shebangs to be Python 3 # Used to mangle unversioned shebangs to be Python 3
BuildRequires: /usr/bin/pathfix.py BuildRequires: python3-devel
%endif
%if %{with_headers} %if %{with_headers}
BuildRequires: rsync BuildRequires: rsync
%endif %endif
@ -1258,7 +1256,6 @@ mv COPYING COPYING-%{version}
# This Prevents scripts/setlocalversion from mucking with our version numbers. # This Prevents scripts/setlocalversion from mucking with our version numbers.
touch .scmversion touch .scmversion
%if 0%{?fedora}
# Mangle /usr/bin/python shebangs to /usr/bin/python3 # Mangle /usr/bin/python shebangs to /usr/bin/python3
# Mangle all Python shebangs to be Python 3 explicitly # Mangle all Python shebangs to be Python 3 explicitly
# -p preserves timestamps # -p preserves timestamps
@ -1277,7 +1274,6 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
tools/perf/scripts/python/sched-migration.py \ tools/perf/scripts/python/sched-migration.py \
Documentation \ Documentation \
scripts/gen_compile_commands.py scripts/gen_compile_commands.py
%endif
# Deal with configs stuff # Deal with configs stuff
mkdir configs mkdir configs