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

Merge tag 'linux-cpupower-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux 

Pull cpupower utility updates for v5.4 from Shuah Khan:

"This cpupower update for Linux 5.4-rc1 consists of bug fixes and
 German translation updates from Benjamin Weis."

* tag 'linux-cpupower-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower: update German translation
  tools/power/cpupower: fix 64bit detection when cross-compiling
  cpupower: Add missing newline at end of file
parents 089cf7f6 87ce2432

tools/power/cpupower/Makefile

+8 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ OUTDIR := $(shell cd $(OUTPUT) && pwd) 
$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

endif



include ../../scripts/Makefile.arch



# --- CONFIGURATION BEGIN ---
@@ -69,11 +68,6 @@ bindir ?= /usr/bin 
sbindir ?=	/usr/sbin

mandir ?=	/usr/man

includedir ?=	/usr/include

ifeq ($(IS_64_BIT), 1)

libdir ?=	/usr/lib64

else

libdir ?=	/usr/lib

endif

localedir ?=	/usr/share/locale

docdir ?=       /usr/share/doc/packages/cpupower

confdir ?=      /etc/
@@ -100,6 +94,14 @@ RANLIB = $(CROSS)ranlib 
HOSTCC = gcc

MKDIR = mkdir



# 64bit library detection

include ../../scripts/Makefile.arch



ifeq ($(IS_64_BIT), 1)

libdir ?=	/usr/lib64

else

libdir ?=	/usr/lib

endif



# Now we set up the build system

#

tools/power/cpupower/po/de.po

+180 −164

File changed.

Preview size limit exceeded, changes collapsed.

tools/power/cpupower/bench/cpufreq-bench_plot.sh

+1 −1

File changed.

Contains only whitespace changes.

tools/power/cpupower/bench/cpufreq-bench_script.sh

+1 −1

File changed.

Contains only whitespace changes.