From: Francesco Poli (wintermute) Date: Tue, 13 May 2025 16:29:33 +0000 (+0200) Subject: cpupower: do not install files to /etc/default/ X-Git-Tag: v6.16-rc1~160^2^2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5174365c13246ed8fd2d40900edec37be6f7a34;p=thirdparty%2Fkernel%2Flinux.git cpupower: do not install files to /etc/default/ Improve the installation procedure for the systemd service unit 'cpupower.service', to be more distro-agnostic. Do not install the service unit configuration file to /etc/default/ (a directory that is used by Debian and Debian-derivatives and only rarely by other distros). Also, clarify the role of the configuration file in its own comments. Link: https://lore.kernel.org/linux-pm/20250509002206.bd2519ba52035d47c3c32aa6@paranoici.org/T/#ma8a3fa80acc4036af6c754e8ecabacc55b288ad1 Link: https://lore.kernel.org/r/20250513163937.61062-5-invernomuto@paranoici.org Fixes: 9c70b779ad91 ("cpupower: add a systemd service to run cpupower") Signed-off-by: Francesco Poli (wintermute) Signed-off-by: Shuah Khan --- diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index 7cec2c30f98a9..be8dfac140763 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile @@ -305,8 +305,8 @@ install-tools: $(OUTPUT)cpupower $(INSTALL_PROGRAM) $(OUTPUT)cpupower $(DESTDIR)${bindir} $(INSTALL) -d $(DESTDIR)${bash_completion_dir} $(INSTALL_SCRIPT) cpupower-completion.sh '$(DESTDIR)${bash_completion_dir}/cpupower' - $(INSTALL) -d $(DESTDIR)${confdir}default - $(INSTALL_DATA) cpupower.default '$(DESTDIR)${confdir}default/cpupower' + $(INSTALL) -d $(DESTDIR)${confdir} + $(INSTALL_DATA) cpupower-service.conf '$(DESTDIR)${confdir}' $(INSTALL) -d $(DESTDIR)${libexecdir} $(INSTALL_PROGRAM) cpupower.sh '$(DESTDIR)${libexecdir}/cpupower' $(INSTALL) -d $(DESTDIR)${libdir}/systemd/system @@ -346,7 +346,7 @@ uninstall: - rm -f $(DESTDIR)${includedir}/cpufreq.h - rm -f $(DESTDIR)${includedir}/cpuidle.h - rm -f $(DESTDIR)${bindir}/utils/cpupower - - rm -f $(DESTDIR)${confdir}default/cpupower + - rm -f $(DESTDIR)${confdir}cpupower-service.conf - rm -f $(DESTDIR)${libexecdir}/cpupower - rm -f $(DESTDIR)${libdir}/systemd/system/cpupower.service - rm -f $(DESTDIR)${mandir}/man1/cpupower.1 diff --git a/tools/power/cpupower/README b/tools/power/cpupower/README index 494104de15405..9de449469568a 100644 --- a/tools/power/cpupower/README +++ b/tools/power/cpupower/README @@ -195,9 +195,9 @@ command: $ sudo systemctl daemon-reload -If you want to enable this systemd service, edit -'${DESTDIR}/etc/default/cpupower' (uncommenting at least one of the options, -depending on your preferences) and then issue the following command: +If you want to enable this systemd service, edit '/etc/cpupower-service.conf' +(uncommenting at least one of the options, depending on your preferences) +and then issue the following command: $ sudo systemctl enable --now cpupower.service diff --git a/tools/power/cpupower/cpupower.default b/tools/power/cpupower/cpupower-service.conf similarity index 67% rename from tools/power/cpupower/cpupower.default rename to tools/power/cpupower/cpupower-service.conf index 376ca40fe5a6a..02eabe8e36142 100644 --- a/tools/power/cpupower/cpupower.default +++ b/tools/power/cpupower/cpupower-service.conf @@ -2,7 +2,11 @@ # Copyright (C) 2012, Sébastien Luttringer # Copyright (C) 2024-2025, Francesco Poli -# Default file for linux-cpupower +# Configuration file for cpupower.service systemd service unit +# +# Edit this file (uncommenting at least one of the options, depending on +# your preferences) and then enable cpupower.service, if you want cpupower +# to run at boot with these settings. # --- CPU clock frequency --- @@ -15,14 +19,14 @@ #MIN_FREQ="2.25GHz" #MAX_FREQ="3GHz" -# Specific frequency to be set. +# Set a specific frequency # Requires userspace governor to be available. # If this option is set, all the previous frequency options are ignored #FREQ= # --- CPU policy --- -# Sets a register on supported Intel processore which allows software to convey +# Set a register on supported Intel processore which allows software to convey # its policy for the relative importance of performance versus energy savings to # the processor. See man CPUPOWER-SET(1) for additional details #PERF_BIAS= diff --git a/tools/power/cpupower/cpupower.service.in b/tools/power/cpupower/cpupower.service.in index f91eaed038720..fbd5b8c142705 100644 --- a/tools/power/cpupower/cpupower.service.in +++ b/tools/power/cpupower/cpupower.service.in @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2012-2020, Sébastien Luttringer -# Copyright (C) 2024, Francesco Poli +# Copyright (C) 2024-2025, Francesco Poli [Unit] Description=Apply cpupower configuration @@ -8,7 +8,7 @@ ConditionVirtualization=!container [Service] Type=oneshot -EnvironmentFile=-___CDIR___default/cpupower +EnvironmentFile=-___CDIR___cpupower-service.conf ExecStart=___LDIR___/cpupower RemainAfterExit=yes