Linux v4.16-rc2-62-g79c0ef3e85c0

3 files changed, 11 insertions, 5 deletions

diff --git a/gitrev b/gitrev
index cd03a3884..62e1aaaaa 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-1388c80438e69fc01d83fbe98da3cac24c3c8731
+79c0ef3e85c015b0921a8fd5dd539d1480e9cd6c
diff --git a/kernel.spec b/kernel.spec
index 1f499bf82..357b1c944 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -124,7 +124,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
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -1522,7 +1522,7 @@ BuildKernel() {
     find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
 
     # build a BLS config for this kernel
-    ./generate_bls_conf.sh "$KernelVer" "$RPM_BUILD_ROOT" "%{?variant}"
+    %{SOURCE43} "$KernelVer" "$RPM_BUILD_ROOT" "%{?variant}"
 }
 
 ###
@@ -1834,7 +1834,7 @@ fi
 /lib/modules/%{KVERREL}%{?3:+%{3}}/build\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/source\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
-/lib/modules/%{KVERREL}%{?2:+%{2}}/bls.conf\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
 %if %{1}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?3:+%{3}}.conf\
@@ -1872,6 +1872,11 @@ fi
 #
 #
 %changelog
+* Tue Feb 20 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc2.git1.1
+- Linux v4.16-rc2-62-g79c0ef3e85c0
+- Reenable debugging options
+- Fix build problems with BLS
+
 * Mon Feb 19 2018 Laura Abbott <labbott@redhat.com>
 - Enable IMA (rhbz 790008)
 
diff --git a/sources b/sources
index 40e49f92f..b79821886 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 SHA512 (patch-4.16-rc2.xz) = 3b72039fee7a481ed6a491a5795b9f1184c8fb4597a96332b513856f82a4410bbffa5bf61b59ec7b6ed4f789b22027d3f20d91b024b9fd3afbbd9ff56499cb8e
+SHA512 (patch-4.16-rc2-git1.xz) = b23653b0deaa753447e98b871e036e2d8af3bd31e42ccfc6c511a3f9b9664d698cb7832497bbaab33521cb3bd48f9bba4a2ff5f458ced50794c876687b8e3b4e