From ac9ff9307c695e3a27985d172ae3654829e242c8 Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Jun 02 2020 17:17:17 +0000 Subject: c7 plus kernel: update to 3.10.0-1127.10.1.el7 Signed-off-by: Akemi Yagi --- diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index 25e8b05..cfc4f25 100644 --- a/SOURCES/Makefile.common +++ b/SOURCES/Makefile.common @@ -9,7 +9,7 @@ RPMVERSION:=3.10.0 # marker is git tag which we base off of for exporting patches MARKER:=v3.10 PREBUILD:= -BUILD:=1127.8.2 +BUILD:=1127.10.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index 7071c7b..44f445e 100644 --- a/SPECS/kernel-plus.spec +++ b/SPECS/kernel-plus.spec @@ -14,10 +14,10 @@ Summary: The Linux kernel %global distro_build 1127 %define rpmversion 3.10.0 -%define pkgrelease 1127.8.2.el7 +%define pkgrelease 1127.10.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1127.8.2%{?dist} +%define specrelease 1127.10.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -574,6 +574,7 @@ Patch20234: centos-linux-3.10-acpi-ghes-bug16315.patch Patch20235: centos-linux-3.10-net-ICMP-report-fix-bug16521.patch Patch20236: centos-linux-3.10-cifs-fix-bug16824.patch #Patch20237: centos-linux-3.10-r8169-fix-network-stalls.patch +Patch20238: centos-linux-3.10-acpi-lock-acquisition-bug17118.patch # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -1050,6 +1051,7 @@ ApplyOptionalPatch centos-linux-3.10-acpi-ghes-bug16315.patch ApplyOptionalPatch centos-linux-3.10-net-ICMP-report-fix-bug16521.patch ApplyOptionalPatch centos-linux-3.10-cifs-fix-bug16824.patch #ApplyOptionalPatch centos-linux-3.10-r8169-fix-network-stalls.patch +ApplyOptionalPatch centos-linux-3.10-acpi-lock-acquisition-bug17118.patch ### end of plus mod # End of CentOS Modification @@ -2052,7 +2054,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Tue May 12 2020 Akemi Yagi [3.10.0-1127.8.2.el7.centos.plus] +* Tue Jun 02 2020 Akemi Yagi [3.10.0-1127.10.1.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2102,7 +2104,6 @@ fi - Add BuildRequires: openssl-devel to the with_perf section [bug#13990] - Add a patch to fix build errors for EL7.5 [bug#14425] - Added a patch to fix alsa potentail crash [bug14779] -- Apply a patch to fix excessive warnings [bug#14413] - Add a patch to fix race in virtio_balloon [bug#15216] - Add shim requirement to the spec file for x86_64 - Apply patches that fix ecryptfs issue [see bugs #7369, #15353] provided by @pgreco @@ -2111,7 +2112,7 @@ fi - Apply a patch for acpi issue [bug#16315] - Apply a patch to fix ICMP redirects [bug#16521] - Apply a patch to fix cifs [bug#16824] -- Add patch centos-linux-3.10-r8169-fix-network-stalls.patch +- Apply a patch to fix acpi bug [bug#17118] * Thu May 07 2020 Augusto Caringi [3.10.0-1127.8.2.el7] - [net] netlabel: cope with NULL catmap (Paolo Abeni) [1827239 1827240] {CVE-2020-10711}