Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc4.git2.1.vanilla.knurd.1.fc29

3 files changed, 23 insertions, 3 deletions

diff --git a/gitrev b/gitrev
index 785651431..7a95399bc 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-f3c0b8ce48408b742a9154d53d19e3c7ff97772d
+4ca719a338d5ebb713e0ae56c208a689f1efe20f
diff --git a/kernel.spec b/kernel.spec
index 755b8f801..74e0f229d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Kernel headers are being split out into a separate package
 %define with_headers 0
@@ -398,6 +398,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
+# Used to mangle unversioned shebangs to be Python 3
+BuildRequires: /usr/bin/pathfix.py
 %if %{with_sparse}
 BuildRequires: sparse
 %endif
@@ -1173,6 +1175,16 @@ find . \( -name "*.orig" -o -name "*~" \) -delete >/dev/null
 # remove unnecessary SCM files
 find . -name .gitignore -delete >/dev/null
 
+# Mangle /usr/bin/python shebangs to /usr/bin/python3
+# Mangle all Python shebangs to be Python 3 explicitly
+# -p preserves timestamps
+# -n prevents creating ~backup files
+# -i specifies the interpreter for the shebang
+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
+
 cd ..
 
 ###
@@ -1887,6 +1899,13 @@ fi
 #
 #
 %changelog
+* Wed Sep 19 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc4.git2.1
+- Linux v4.19-rc4-86-g4ca719a338d5
+
+* Tue Sep 18 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc4.git1.1
+- Linux v4.19-rc4-78-g5211da9ca526
+- Enable debugging options.
+
 * Mon Sep 17 2018 Jeremy Cline <jeremy@jcline.org> - 4.19.0-0.rc4.git0.1
 - Linux v4.19-rc4
 
diff --git a/sources b/sources
index 79da29e0a..06b49fb14 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
 SHA512 (patch-4.19-rc4.xz) = 31fa976573d724ab5592dbb97473c5523dea635e0f1235bb61ca8e81b7146218e277238039b817a82a3763d0b667038cb85a41fd103d680037db7cad40a88cd3
+SHA512 (patch-4.19-rc4-git2.xz) = 8119a69d31507a6577b22dc34e926a1c3119826b2f792ae5f0d3d78c761133821eb9ab84ab700411447fe3c9a54e88650fb7f6a6c1175c3290ff72f8ca508b19