[GIT PULL] cpupower urgent fix for Linux 6.16-rc2

[GIT PULL] cpupower urgent fix for Linux 6.16-rc2

[Shuah Khan]

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

Hi Rafael,

Please pull this cpupower urgent fix for Linux 6.16-rc2.

Add unitdir variable for specifying the location to install systemd
service units instead of installing under ${libdir}/systemd/system
which doesn't work on some distributions.

Note: I meant to send this during the merge window and ran into some
merge conflicts during the PR test. Decided to wait on it until rc1.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 19272b37aa4f83ca52bdf9c16d5d81bdd1354494:

   Linux 6.16-rc1 (2025-06-08 13:44:43 -0700)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-6.16-rc2-fixes

for you to fetch changes up to e044b8a9545cd8265c7110c179aeec2624c16455:

   cpupower: split unitdir from libdir in Makefile (2025-06-09 10:17:46 -0600)

----------------------------------------------------------------
linux-cpupower-6.16-rc2-fixes

Add unitdir variable for specifying the location to install systemd
service units instead of installing under ${libdir}/systemd/system
which doesn't work on some distributions.

----------------------------------------------------------------
Francesco Poli (wintermute) (1):
       cpupower: split unitdir from libdir in Makefile

  tools/power/cpupower/Makefile | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)

----------------------------------------------------------------

[-- Attachment #2: linux-cpupower-6.16-rc2-fixes.diff --]
[-- Type: text/x-patch, Size: 1680 bytes --]

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

Re: [GIT PULL] cpupower urgent fix for Linux 6.16-rc2

[Rafael J. Wysocki]

Hi Shuah,

On Tue, Jun 10, 2025 at 5:37 PM Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> Hi Rafael,
>
> Please pull this cpupower urgent fix for Linux 6.16-rc2.
>
> Add unitdir variable for specifying the location to install systemd
> service units instead of installing under ${libdir}/systemd/system
> which doesn't work on some distributions.
>
> Note: I meant to send this during the merge window and ran into some
> merge conflicts during the PR test. Decided to wait on it until rc1.
>
> diff is attached.
>
> thanks,
> -- Shuah
>
> ----------------------------------------------------------------
> The following changes since commit 19272b37aa4f83ca52bdf9c16d5d81bdd1354494:
>
>    Linux 6.16-rc1 (2025-06-08 13:44:43 -0700)
>
> are available in the Git repository at:
>
>    git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-6.16-rc2-fixes
>
> for you to fetch changes up to e044b8a9545cd8265c7110c179aeec2624c16455:
>
>    cpupower: split unitdir from libdir in Makefile (2025-06-09 10:17:46 -0600)
>
> ----------------------------------------------------------------
> linux-cpupower-6.16-rc2-fixes
>
> Add unitdir variable for specifying the location to install systemd
> service units instead of installing under ${libdir}/systemd/system
> which doesn't work on some distributions.
>
> ----------------------------------------------------------------
> Francesco Poli (wintermute) (1):
>        cpupower: split unitdir from libdir in Makefile
>
>   tools/power/cpupower/Makefile | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
>
> ----------------------------------------------------------------

Pulled and added to linux-pm.git/fixes, thanks!