Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc2.git3.1.vanilla.knurd.1.fc30kernel-5.0.0-0.rc2.git3.1.vanilla.knurd.1.fc29kernel-5.0.0-0.rc2.git3.1.vanilla.knurd.1.fc28

3 files changed, 11 insertions, 4 deletions

diff --git a/gitrev b/gitrev
index 902936458..e5a4991f8 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-47bfa6d9dc8c060bf56554a465c9031e286d2f80
+7fbfee7c80ded94278f109aae4063741c323294a
diff --git a/kernel.spec b/kernel.spec
index c194b5aa3..c6113181d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -403,8 +403,10 @@ 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, gcc-plugin-devel
+%if 0%{?fedora}
 # Used to mangle unversioned shebangs to be Python 3
 BuildRequires: /usr/bin/pathfix.py
+%endif
 %if %{with_sparse}
 BuildRequires: sparse
 %endif
@@ -1164,6 +1166,7 @@ find . \( -name "*.orig" -o -name "*~" \) -delete >/dev/null
 # remove unnecessary SCM files
 find . -name .gitignore -delete >/dev/null
 
+%if 0%{?fedora}
 # Mangle /usr/bin/python shebangs to /usr/bin/python3
 # Mangle all Python shebangs to be Python 3 explicitly
 # -p preserves timestamps
@@ -1173,6 +1176,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/diffconfig
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/bloat-o-meter
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/show_delta
+%endif
 
 cd ..
 
@@ -1241,7 +1245,7 @@ BuildKernel() {
 
     # make sure EXTRAVERSION says what we want it to say
     # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters
-    ShortRel=$(python3 -c "import re; print(re.sub(r'\.pr\.[0-9A-Fa-f]{32}', '', '%{release}'))")
+    ShortRel=$(perl -e "print \"%{release}\" =~ s/\.pr\.[0-9A-Fa-f]{32}//r")
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${ShortRel}.%{_target_cpu}${Flav}/" Makefile
 
     # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme
@@ -1890,6 +1894,9 @@ fi
 #
 #
 %changelog
+* Thu Jan 17 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc2.git3.1
+- Linux v5.0-rc2-145-g7fbfee7c80de
+
 * Wed Jan 16 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc2.git2.1
 - Linux v5.0-rc2-141-g47bfa6d9dc8c
 
diff --git a/sources b/sources
index 8177c057f..36d4cdc2f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.0-rc2.tar.gz) = 93d1d32cadc1d55354cc7706b718f3a6c46abdf635fda8e4a0c34d9fce79a3a2d8ec5d12850f9813cdea7c7236846b95e1db48498ed8c5b425abd36e4801ed81
-SHA512 (patch-5.0-rc2-git2.xz) = 765207f481ed1d51cbccd6c7370b44e828b6ee5f33aa976e02b15aafe5fd810c5764f311d124b408fe8e6efc54c19ebc1753ae5fb4877d3d8b4d49b6290559fb
+SHA512 (patch-5.0-rc2-git3.xz) = 40e3eae9083ad664e8adc1790837acc914e77c93de4aa0e2ac4a93959373ae5647b1e15716d7528c6bf7e6534807395025bba0d62094f5a743a587f2f0da8209