Commit d08293ef authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'linux-cpupower-6.16-rc2-fixes' of... 

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
parents 19272b37 e044b8a9

tools/power/cpupower/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -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