From b5640bc61e27b6add42a9d91939e12b3ab32638b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 28 May 2025 12:48:35 -0600 Subject: [PATCH] kernel-6.16.0-0.rc0.250528gfeacb1774bd5.5 * Wed May 28 2025 Fedora Kernel Team [6.16.0-0.rc0.feacb1774bd5.5] - powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel.spec | 9 ++++++++- patch-6.16-redhat.patch | 37 ++++++++++++++++++++++++++++++++++++- sources | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 35be1f9aa..7e88faf25 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/99f9c905b3d28da389389255532e3d42dd93c7aa + 99f9c905b3d28da389389255532e3d42dd93c7aa cpupower: split unitdir from libdir in Makefile + https://gitlab.com/cki-project/kernel-ark/-/commit/2c38535e57f2ffa7ff67dd824e4d1f525a4922d7 2c38535e57f2ffa7ff67dd824e4d1f525a4922d7 powerpc: Fix struct termio related ioctl macros diff --git a/kernel.spec b/kernel.spec index db199e28b..9702b3549 100644 --- a/kernel.spec +++ b/kernel.spec @@ -3447,7 +3447,7 @@ rm -rf %{buildroot}%{_libdir}/libperf.a %if %{with_tools} %ifarch %{cpupowerarchs} -%{make} -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install +%{make} -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} libexecdir=%{_libexecdir} mandir=%{_mandir} unitdir=%{_unitdir} CPUFREQ_BENCH=false install %find_lang cpupower mv cpupower.lang ../ %ifarch x86_64 @@ -4010,6 +4010,9 @@ fi\ %else %files -n %{package_name}-tools -f cpupower.lang %{_bindir}/cpupower +%{_libexecdir}/cpupower +%{_unitdir}/cpupower.service +%config(noreplace) %{_sysconfdir}/cpupower-service.conf %{_datadir}/bash-completion/completions/cpupower %ifarch x86_64 %{_bindir}/centrino-decode @@ -4269,6 +4272,10 @@ fi\ # # %changelog +* Wed May 28 2025 Justin M. Forbes [6.16.0-0.rc0.250528gfeacb1774bd5.5] +- package the newly added cpupower.service (Thorsten Leemhuis) +- cpupower: split unitdir from libdir in Makefile (Francesco Poli (wintermute)) + * Wed May 28 2025 Fedora Kernel Team [6.16.0-0.rc0.feacb1774bd5.5] - powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) diff --git a/patch-6.16-redhat.patch b/patch-6.16-redhat.patch index f5c295ab2..7e2a2b63d 100644 --- a/patch-6.16-redhat.patch +++ b/patch-6.16-redhat.patch @@ -77,7 +77,8 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 79 files changed, 2735 insertions(+), 212 deletions(-) + tools/power/cpupower/Makefile | 9 +- + 80 files changed, 2740 insertions(+), 216 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index ea81784be981..5ed71f7a9eb4 100644 @@ -4496,3 +4497,37 @@ index cf83afa1d879..aba751e7abff 100644 static struct security_hook_list lockdown_hooks[] __ro_after_init = { LSM_HOOK_INIT(locked_down, lockdown_is_locked_down), }; +diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile +index be8dfac14076..c43db1c41205 100644 +--- a/tools/power/cpupower/Makefile ++++ b/tools/power/cpupower/Makefile +@@ -73,6 +73,7 @@ sbindir ?= /usr/sbin + mandir ?= /usr/man + libdir ?= /usr/lib + libexecdir ?= /usr/libexec ++unitdir ?= /usr/lib/systemd/system + includedir ?= /usr/include + localedir ?= /usr/share/locale + docdir ?= /usr/share/doc/packages/cpupower +@@ -309,9 +310,9 @@ install-tools: $(OUTPUT)cpupower + $(INSTALL_DATA) cpupower-service.conf '$(DESTDIR)${confdir}' + $(INSTALL) -d $(DESTDIR)${libexecdir} + $(INSTALL_PROGRAM) cpupower.sh '$(DESTDIR)${libexecdir}/cpupower' +- $(INSTALL) -d $(DESTDIR)${libdir}/systemd/system +- sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${libdir}/systemd/system/cpupower.service' +- $(SETPERM_DATA) '$(DESTDIR)${libdir}/systemd/system/cpupower.service' ++ $(INSTALL) -d $(DESTDIR)${unitdir} ++ sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${unitdir}/cpupower.service' ++ $(SETPERM_DATA) '$(DESTDIR)${unitdir}/cpupower.service' + + install-man: + $(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1 +@@ -348,7 +349,7 @@ uninstall: + - rm -f $(DESTDIR)${bindir}/utils/cpupower + - rm -f $(DESTDIR)${confdir}cpupower-service.conf + - rm -f $(DESTDIR)${libexecdir}/cpupower +- - rm -f $(DESTDIR)${libdir}/systemd/system/cpupower.service ++ - rm -f $(DESTDIR)${unitdir}/cpupower.service + - rm -f $(DESTDIR)${mandir}/man1/cpupower.1 + - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1 + - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1 diff --git a/sources b/sources index a2a7367f7..37c17bc5b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.15-3589-gfeacb1774bd5.tar.xz) = e9d6eae24c346eb552c755fea09402aca7c22b83953d81c98f159fcd1a56256fdd17226aa4abe2230ee819a7a7cfef78b49bf0b1051cc7c22044f6be588b2619 -SHA512 (kernel-abi-stablelists-6.16.0.tar.xz) = 60a28af2d685479e2422c39edd7eeb41df7a0a20a8e834ce3da12dd4225775d44bd08c4890efb364a956ee120044c752f40d4b4c4e6f1e598f0414b2671db436 +SHA512 (kernel-abi-stablelists-6.16.0.tar.xz) = 88896de686aafe471ae98a7cb95821cebc8a93aef0b7e4368302f180b31af291405c2d948531af146804a0e444df864ef23d6fce1a382adea384c562d2b8664b SHA512 (kernel-kabi-dw-6.16.0.tar.xz) = 0bbafeefc95d209231712991b1c20240cac93b1fde6f707518626ca03f18a518b4866e7572ac3eab28175eaa1688289567406690c77c48d3c55ea0cdd3b408da