]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cpupower: split unitdir from libdir in Makefile
authorFrancesco Poli (wintermute) <invernomuto@paranoici.org>
Wed, 21 May 2025 21:14:39 +0000 (23:14 +0200)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 9 Jun 2025 16:17:46 +0000 (10:17 -0600)
Improve the installation procedure for the systemd service unit
'cpupower.service', to be more flexible. Some distros install libraries
to /usr/lib64/, but systemd service units have to be installed to
/usr/lib/systemd/system: as a consequence, the installation procedure
should not assume that systemd service units can be installed to
${libdir}/systemd/system ...
Define a dedicated variable ("unitdir") in the Makefile.

Link: https://lore.kernel.org/linux-pm/260b6d79-ab61-43b7-a0eb-813e257bc028@leemhuis.info/T/#m0601940ab439d5cbd288819d2af190ce59e810e6
Fixes: 9c70b779ad91 ("cpupower: add a systemd service to run cpupower")
Link: https://lore.kernel.org/r/20250521211656.65646-1-invernomuto@paranoici.org
Signed-off-by: Francesco Poli (wintermute) <invernomuto@paranoici.org>
Tested-by: Thorsten Leemhuis <linux@leemhuis.info>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/power/cpupower/Makefile

index be8dfac140763524ab08f6aea12746bebc117a38..c43db1c412051dc9061139ed6bf969819e528cdc 100644 (file)
@@ -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