From 4019404bbca31c28da0e8f74f06473df1798a437 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 5 Nov 2019 16:48:22 -0500 Subject: [PATCH] Drop Fedora checks around pathfix The el7 buildroot now has pathfix so we can drop these checks. --- kernel.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kernel.spec b/kernel.spec index e98a3eedc..1ff43fb0a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex BuildRequires: net-tools, hostname, bc, elfutils-devel, dwarves -%if 0%{?fedora} # Used to mangle unversioned shebangs to be Python 3 -BuildRequires: /usr/bin/pathfix.py -%endif +BuildRequires: python3-devel %if %{with_headers} BuildRequires: rsync %endif @@ -1258,7 +1256,6 @@ mv COPYING COPYING-%{version} # This Prevents scripts/setlocalversion from mucking with our version numbers. touch .scmversion -%if 0%{?fedora} # Mangle /usr/bin/python shebangs to /usr/bin/python3 # Mangle all Python shebangs to be Python 3 explicitly # -p preserves timestamps @@ -1277,7 +1274,6 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \ tools/perf/scripts/python/sched-migration.py \ Documentation \ scripts/gen_compile_commands.py -%endif # Deal with configs stuff mkdir configs