From: Greg Kroah-Hartman Date: Sat, 7 Oct 2023 16:12:37 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.14.327~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e482b52bafc7797c9cb0a64652a50557c91d30b3;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: cpupower-add-makefile-dependencies-for-install-targets.patch --- diff --git a/queue-4.19/cpupower-add-makefile-dependencies-for-install-targets.patch b/queue-4.19/cpupower-add-makefile-dependencies-for-install-targets.patch new file mode 100644 index 00000000000..abeb8466214 --- /dev/null +++ b/queue-4.19/cpupower-add-makefile-dependencies-for-install-targets.patch @@ -0,0 +1,67 @@ +From fb7791e213a64495ec2336869b868fcd8af14346 Mon Sep 17 00:00:00 2001 +From: Ivan Babrou +Date: Mon, 4 Jan 2021 15:57:18 -0800 +Subject: cpupower: add Makefile dependencies for install targets + +From: Ivan Babrou + +commit fb7791e213a64495ec2336869b868fcd8af14346 upstream. + +This allows building cpupower in parallel rather than serially. + +Signed-off-by: Ivan Babrou +Signed-off-by: Shuah Khan +Cc: Hauke Mehrtens +Signed-off-by: Greg Kroah-Hartman +--- + tools/power/cpupower/Makefile | 8 ++++---- + tools/power/cpupower/bench/Makefile | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/tools/power/cpupower/Makefile ++++ b/tools/power/cpupower/Makefile +@@ -278,14 +278,14 @@ clean: + $(MAKE) -C bench O=$(OUTPUT) clean + + +-install-lib: ++install-lib: libcpupower + $(INSTALL) -d $(DESTDIR)${libdir} + $(CP) $(OUTPUT)libcpupower.so* $(DESTDIR)${libdir}/ + $(INSTALL) -d $(DESTDIR)${includedir} + $(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h + $(INSTALL_DATA) lib/cpuidle.h $(DESTDIR)${includedir}/cpuidle.h + +-install-tools: ++install-tools: $(OUTPUT)cpupower + $(INSTALL) -d $(DESTDIR)${bindir} + $(INSTALL_PROGRAM) $(OUTPUT)cpupower $(DESTDIR)${bindir} + +@@ -299,14 +299,14 @@ install-man: + $(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1 + $(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1 + +-install-gmo: ++install-gmo: create-gmo + $(INSTALL) -d $(DESTDIR)${localedir} + for HLANG in $(LANGUAGES); do \ + echo '$(INSTALL_DATA) -D $(OUTPUT)po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo'; \ + $(INSTALL_DATA) -D $(OUTPUT)po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \ + done; + +-install-bench: ++install-bench: compile-bench + @#DESTDIR must be set from outside to survive + @sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) $(MAKE) -C bench O=$(OUTPUT) install + +--- a/tools/power/cpupower/bench/Makefile ++++ b/tools/power/cpupower/bench/Makefile +@@ -27,7 +27,7 @@ $(OUTPUT)cpufreq-bench: $(OBJS) + + all: $(OUTPUT)cpufreq-bench + +-install: ++install: $(OUTPUT)cpufreq-bench + mkdir -p $(DESTDIR)/$(sbindir) + mkdir -p $(DESTDIR)/$(bindir) + mkdir -p $(DESTDIR)/$(docdir) diff --git a/queue-4.19/series b/queue-4.19/series index f19b3876930..620b1cb2b0d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -87,3 +87,4 @@ tcp-fix-quick-ack-counting-to-count-actual-acks-of-n.patch tcp-fix-delayed-acks-for-mss-boundary-condition.patch sctp-update-transport-state-when-processing-a-dupcoo.patch sctp-update-hb-timer-immediately-after-users-change-.patch +cpupower-add-makefile-dependencies-for-install-targets.patch