From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat: Remove cpupower files
The cpupower.config and cpupower.service files no longer serve a purpose.
System level performance control is generally controlled by tuned and
other system applications.
Remove the cpupower files from the kernel.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -626,8 +626,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
@sed -e "s/%%SPECKVERSION%%/$(SPECKVERSION)/" \
-e "s/%%SPECKPATCHLEVEL%%/$(SPECKPATCHLEVEL)/" \
rpminspect.yaml > $(SOURCES)/rpminspect.yaml
- @cp cpupower.* \
- keys/rhel*.x509 \
+ @cp keys/rhel*.x509 \
kabi/check-kabi \
configs/$(PACKAGE_NAME)-*.config \
configs/partial*.config \
diff --git a/redhat/cpupower.config b/redhat/cpupower.config
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/cpupower.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# See 'cpupower help' and cpupower(1) for more info
-CPUPOWER_START_OPTS="frequency-set -g performance"
-CPUPOWER_STOP_OPTS="frequency-set -g ondemand"
diff --git a/redhat/cpupower.service b/redhat/cpupower.service
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/cpupower.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Configure CPU power related settings
-After=syslog.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/sysconfig/cpupower
-ExecStart=/usr/bin/cpupower $CPUPOWER_START_OPTS
-ExecStop=/usr/bin/cpupower $CPUPOWER_STOP_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -840,8 +840,6 @@ Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
# Sources for kernel-tools
-Source2000: cpupower.service
-Source2001: cpupower.config
Source2002: kvm_stat.logrotate
# Some people enjoy building customized kernels from the dist-git in Fedora and
@@ -2591,9 +2589,6 @@ mv cpupower.lang ../
popd
%endif
chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
-mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
-install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
-install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
%endif
%ifarch x86_64
mkdir -p %{buildroot}%{_mandir}/man8
@@ -2739,15 +2734,6 @@ popd
###
%if %{with_tools}
-%post -n kernel-tools
-%systemd_post cpupower.service
-
-%preun -n kernel-tools
-%systemd_preun cpupower.service
-
-%postun -n kernel-tools
-%systemd_postun cpupower.service
-
%post -n kernel-tools-libs
/sbin/ldconfig
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2125
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
