diff options
| -rw-r--r-- | SOURCES/Patchlist.changelog | 3 | ||||
| -rw-r--r-- | SOURCES/patch-6.8-redhat.patch | 16 | ||||
| -rw-r--r-- | SPECS/kernel.spec | 15 |
3 files changed, 5 insertions, 29 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index 86f341d..cb33f64 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,6 +1,3 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/0c2a5d1fe131e609b8939b1be078241fe07823bd - 0c2a5d1fe131e609b8939b1be078241fe07823bd Revert "cpupower: Bump soname version" - "https://gitlab.com/cki-project/kernel-ark/-/commit"/e56840b5f971b4d0f4032f6f5ab95c0c5ba40f8e e56840b5f971b4d0f4032f6f5ab95c0c5ba40f8e nouveau: fix devinit paths to only handle display on GSP. diff --git a/SOURCES/patch-6.8-redhat.patch b/SOURCES/patch-6.8-redhat.patch index 676fce8..1bafd38 100644 --- a/SOURCES/patch-6.8-redhat.patch +++ b/SOURCES/patch-6.8-redhat.patch @@ -35,8 +35,7 @@ security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - tools/power/cpupower/Makefile | 2 +- - 38 files changed, 672 insertions(+), 178 deletions(-) + 37 files changed, 671 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile index e6c0a00722ea..ac70a1596394 100644 @@ -1545,16 +1544,3 @@ index a344b8fa5530..51b5bea3b0c7 100644 #ifdef CONFIG_PERF_EVENTS /** * security_perf_event_open() - Check if a perf event open is allowed -diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile -index b53753dee02f..90701fc65aa2 100644 ---- a/tools/power/cpupower/Makefile -+++ b/tools/power/cpupower/Makefile -@@ -53,7 +53,7 @@ DESTDIR ?= - - VERSION:= $(shell ./utils/version-gen.sh) - LIB_MAJ= 0.0.1 --LIB_MIN= 1 -+LIB_MIN= 0 - - PACKAGE = cpupower - PACKAGE_BUGREPORT = linux-pm@vger.kernel.org diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 5e58e91..662fd7b 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.7 %define specversion 6.8.7 %define patchversion 6.8 -%define pkgrelease 200 +%define pkgrelease 300 %define kversion 6 %define tarfile_release 6.8.7 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 202%{?buildid}%{?dist} +%define specrelease 301%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.7 @@ -3871,7 +3871,7 @@ fi\ %ifarch %{cpupowerarchs} %files -n %{package_name}-tools-libs -%{_libdir}/libcpupower.so.0 +%{_libdir}/libcpupower.so.1 %{_libdir}/libcpupower.so.0.0.1 %files -n %{package_name}-tools-libs-devel @@ -4104,16 +4104,9 @@ fi\ # # %changelog -* Sat Apr 20 2024 Jan200101 <sentrycraft123@gmail.com> - 6.8.7-202.fsync -- kernel-fsync v6.8.7 bluetooth hang fix - -* Thu Apr 18 2024 Jan200101 <sentrycraft123@gmail.com> - 6.8.7-201.fsync +* Tue Apr 23 2024 Jan200101 <sentrycraft123@gmail.com> - 6.8.7-301.fsync - kernel-fsync v6.8.7 -* Wed Apr 17 2024 Augusto Caringi <acaringi@redhat.com> [6.8.7-200] -- Revert "cpupower: Bump soname version" (Justin M. Forbes) -- Drop soname for libcpupower.so since we reverted the bump (Justin M. Forbes) - * Wed Apr 17 2024 Augusto Caringi <acaringi@redhat.com> [6.8.7-0] - redhat/configs: Enable CONFIG_MITIGATION_SPECTRE_BHI (Augusto Caringi) - Turn on XEN_BALLOON_MEMORY_HOTPLUG for Fedora (Justin M. Forbes) |