diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-03-03 06:21:38 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-03-03 06:21:38 +0100 |
| commit | 4afc3dc1082b2c7c8029b83574d82b14661e0d6e (patch) | |
| tree | 41d3989a9ed69d8ab5952cc7b51fd1ac277f6b99 /kernel.spec | |
| parent | 593fc0b3f1c97360f7a089d2d5c5490ee0822cc9 (diff) | |
| parent | 9650c09f78057d14f01365d4a23fdef082c623ae (diff) | |
| download | kernel-4afc3dc1082b2c7c8029b83574d82b14661e0d6e.tar.gz kernel-4afc3dc1082b2c7c8029b83574d82b14661e0d6e.tar.xz kernel-4afc3dc1082b2c7c8029b83574d82b14661e0d6e.zip | |
merge master
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/kernel.spec b/kernel.spec index bc7bd45b6..b328cacd7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -898,13 +898,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 -# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support) -Patch527: alsa-5.6.patch - -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 @@ -1576,7 +1569,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. @@ -1899,7 +1891,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 @@ -2694,10 +2685,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} @@ -2727,10 +2714,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 @@ -2938,7 +2921,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}\ @@ -2992,6 +2974,12 @@ 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. + * Fri Feb 28 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc3.git3.1 - Linux v5.6-rc3-195-gc60c04021353 |