github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

linux-cpupower-6.16-rc2-fixes

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPZKym/RZuOCGeA/kCwJExA0NQxwFAmhITTwACgkQCwJExA0N
 QxzuzhAAvnJye5jX0Y01di02kaTr7ETDYYmf/teUxrxNBHU1zYcDpnbTrLlrhssl
 eTkTj2GuLRn7NZqCg3HGaUir6sbXbYf+mjDrDi3xP4GWIeRErqa3dMMr6zv4w9Jo
 w2MrPXj4ZQxGB0Hvh1g/GhPd83JzxYU9wC+muDpnQPYtiZGeIObZZ3ee+ERPVD7y
 b4+m4O2w8vjDx/Gn8LQ4bdq57UNdxzSdf8Vt9/jNRIQ9JV1rMv/+OqyCIiKuFLTP
 LazeXTpHLBV87KOu8XCoFl0UHr+HytBsxRf1ZhiiDaSERiDT3A5RWcmrKQutoGHD
 whx9AMzpdB7ygvDMLPRT+Fqm9r/sFLnof79qTzjyHYmRgZWvItnr/jW8IZAPf145
 YxTE2lLSPyaLtWvVWKm5Yumvc2NOApbi2aNL4ED0lFek9shcK5uCtjg3Zf9tkuBY
 CWOCaLKZY52SazXxsUJRx8uekpVDyb9xYtrRTPyI0enoBYR09TkVaoD+2XuVN0sl
 XjMJ6QVeid8PhbgokV3uKslNOCu54kHJaoXx5Yw6anip1FTYp0gVKMIsx4Bpz+0T
 icXeafx9phciJHlGNih36V/sKWs+2ch2+sg9avn9dYpwkXLzjqegzm+kAMZmAKdH
 5AWaScwE7VUMVRBQ8knm/dmN/TdIVO8BKMQFKaVVq3ZZG0t25ZY=
 =268v
 -----END PGP SIGNATURE-----

Merge tag 'linux-cpupower-6.16-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux

Merge an urgent cpupower utility fix for 6.16-rc1 from Shuah Khan:

"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."

* tag 'linux-cpupower-6.16-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower: split unitdir from libdir in Makefile
This commit is contained in:
Rafael J. Wysocki 2025-06-10 19:15:54 +02:00
commit d08293ef1e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/power/cpupower/Makefile
View 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