Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

3 files changed, 43 insertions, 4 deletions

diff --git a/generate_bls_conf.sh b/generate_bls_conf.sh
new file mode 100755
index 000000000..8d9ec0699
--- /dev/null
+++ b/generate_bls_conf.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+
+. /etc/os-release
+
+kernelver=$1 && shift
+rootfs=$1 && shift
+variant=$1 && shift
+
+output="${rootfs}/lib/modules/${kernelver}/bls.conf"
+date=$(date -u +%Y%m%d%H%M%S)
+
+if [ "${variant:-5}" = "debug" ]; then
+    debugname=" with debugging"
+else
+    debugname=""
+fi
+
+cat >${output} <<EOF
+title ${NAME} (${kernelver}) ${VERSION}${debugname}
+linux ${bootprefix}/vmlinuz-${kernelver}
+initrd ${bootprefix}/initramfs-${kernelver}.img
+options \$kernelopts
+id ${ID}-${date}-${kernelver}
+grub_users \$grub_users
+grub_arg --unrestricted
+grub_class kernel${variant}
+EOF
diff --git a/kernel.spec b/kernel.spec
index 4e8b7faa7..0333fc4c9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,9 +75,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 1
+%global rcrev 2
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -477,6 +477,7 @@ Source40: generate_all_configs.sh
 Source41: generate_debug_configs.sh
 
 Source42: process_configs.sh
+Source43: generate_bls_conf.sh
 
 # This file is intentionally left empty in the stock kernel. Its a nicety
 # added for those wanting to do custom rebuilds with altered config opts.
@@ -1124,6 +1125,7 @@ cp %{SOURCE1000} .
 cp %{SOURCE15} .
 cp %{SOURCE40} .
 cp %{SOURCE41} .
+cp %{SOURCE43} .
 
 %if !%{debugbuildsenabled}
 # The normal build is a really debug build and the user has explicitly requested
@@ -1538,6 +1540,9 @@ BuildKernel() {
 
     # prune junk from kernel-devel
     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}"
 }
 
 ###
@@ -1849,6 +1854,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\
 %if %{1}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?3:+%{3}}.conf\
@@ -1886,6 +1892,12 @@ fi
 #
 #
 %changelog
+* Mon Feb 19 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc2.git0.1
+- Linux v4.16-rc2
+
+* Mon Feb 19 2018 Jeremy Cline <jeremy@jcline.org>
+- Disable debugging options.
+
 * Fri Feb 16 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc1.git4.1
 - Linux v4.16-rc1-100-g1388c80438e6
 
diff --git a/sources b/sources
index 8392b96d4..40e49f92f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
-SHA512 (patch-4.16-rc1.xz) = bedbdd6d8e08734083b03ef453e4f46b17016a936ebbd0a1908df7b5a3bdcfc0990d35f4dff83fd83008e4dfe326ccc9f406080cd8818c2d24e20eadaf37598b
-SHA512 (patch-4.16-rc1-git4.xz) = 42de6078146004a310e45d53b9a4942771b57e4b3dcedbb52adf9a2f91736994a86f07b950f7fc7a09ec4eb63717e805f36e8fb6126b36f69f139ef04f17a605
+SHA512 (patch-4.16-rc2.xz) = 3b72039fee7a481ed6a491a5795b9f1184c8fb4597a96332b513856f82a4410bbffa5bf61b59ec7b6ed4f789b22027d3f20d91b024b9fd3afbbd9ff56499cb8e