From d930d14b9194ce83b038d78eb1fc4f6c3e1024ff Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Mon, 2 Mar 2020 11:00:55 -0500
Subject: Disable debugging options.

---
 kernel.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'kernel.spec')

diff --git a/kernel.spec b/kernel.spec
index 88afaa408..ebccd75cd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -200,7 +200,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 0
+%define debugbuildsenabled 1
 
 %if 0%{?fedora}
 # Kernel headers are being split out into a separate package
@@ -2970,6 +2970,9 @@ fi
 #
 #
 %changelog
+* Mon Mar 02 2020 Jeremy Cline <jcline@redhat.com>
+- Disable debugging options.
+
 * Fri Feb 28 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc3.git3.1
 - Linux v5.6-rc3-195-gc60c04021353
 
-- 
cgit 


From 522a4ae7e933c4c882d60313d6ce300641ad6e6d Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Mon, 2 Mar 2020 11:12:06 -0500
Subject: Linux v5.6-rc4

---
 kernel.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'kernel.spec')

diff --git a/kernel.spec b/kernel.spec
index ebccd75cd..da7248471 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -105,9 +105,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 3
+%global rcrev 4
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -881,11 +881,6 @@ Patch504: 0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
 # https://lkml.org/lkml/2019/8/29/1772
 Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch
 
-# GCC 10 build fix for x86_64
-Patch529: 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch
-
-Patch530: 0001-compat_ioctl-cdrom-Replace-.ioctl-with-.compat_ioctl.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2970,6 +2965,9 @@ fi
 #
 #
 %changelog
+* Mon Mar 02 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc4.git0.1
+- Linux v5.6-rc4
+
 * Mon Mar 02 2020 Jeremy Cline <jcline@redhat.com>
 - Disable debugging options.
 
-- 
cgit 


From 4b5dd4c55305f636f03df43f92eb93b1f72c65f4 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Mon, 2 Mar 2020 11:54:32 -0500
Subject: Back out the weak-modules scriptlets because they are still broken

---
 kernel.spec | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'kernel.spec')

diff --git a/kernel.spec b/kernel.spec
index da7248471..1bcb99d55 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1872,7 +1872,6 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/internal
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
-    mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates
     # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of
     # testing so just delete
     find . -name *.h.s -delete
@@ -2667,10 +2666,6 @@ fi\
 #
 %define kernel_variant_posttrans() \
 %{expand:%%posttrans %{?1:%{1}-}core}\
-if [ -x %{_sbindir}/weak-modules ]\
-then\
-    %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
-fi\
 /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
 %{nil}
 
@@ -2700,10 +2695,6 @@ fi}\
 %define kernel_variant_preun() \
 %{expand:%%preun %{?1:%{1}-}core}\
 /bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
-if [ -x %{_sbindir}/weak-modules ]\
-then\
-    %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
-fi\
 %{nil}
 
 %kernel_variant_preun
@@ -2911,7 +2902,6 @@ fi
 /lib/modules/%{KVERREL}%{?3:+%{3}}/source\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
-/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
 %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca.cer\
 %ifarch s390x ppc64le\
 %if 0%{!?4:1}\
-- 
cgit 


From 9650c09f78057d14f01365d4a23fdef082c623ae Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Mon, 2 Mar 2020 16:02:29 -0500
Subject: sync-check.sh is +x upstream now, drop the chmod

---
 kernel.spec | 1 -
 1 file changed, 1 deletion(-)

(limited to 'kernel.spec')

diff --git a/kernel.spec b/kernel.spec
index 1bcb99d55..168a12fc8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1549,7 +1549,6 @@ git am %{patches}
 # Any further pre-build tree manipulations happen here.
 
 chmod +x scripts/checkpatch.pl
-chmod +x tools/objtool/sync-check.sh
 mv COPYING COPYING-%{version}-%{release}
 
 # This Prevents scripts/setlocalversion from mucking with our version numbers.
-- 
cgit