From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 7 Oct 2023 16:12:25 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.14.327~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a7ca96730cab0be9af6ec2accf05949f958342f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	cpupower-add-makefile-dependencies-for-install-targets.patch
---

diff --git a/queue-4.14/cpupower-add-makefile-dependencies-for-install-targets.patch b/queue-4.14/cpupower-add-makefile-dependencies-for-install-targets.patch
new file mode 100644
index 00000000000..14d8114d3f8
--- /dev/null
+++ b/queue-4.14/cpupower-add-makefile-dependencies-for-install-targets.patch
@@ -0,0 +1,67 @@
+From fb7791e213a64495ec2336869b868fcd8af14346 Mon Sep 17 00:00:00 2001
+From: Ivan Babrou <ivan@cloudflare.com>
+Date: Mon, 4 Jan 2021 15:57:18 -0800
+Subject: cpupower: add Makefile dependencies for install targets
+
+From: Ivan Babrou <ivan@cloudflare.com>
+
+commit fb7791e213a64495ec2336869b868fcd8af14346 upstream.
+
+This allows building cpupower in parallel rather than serially.
+
+Signed-off-by: Ivan Babrou <ivan@cloudflare.com>
+Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
+Cc: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -272,14 +272,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}
+ 
+@@ -293,14 +293,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.14/series b/queue-4.14/series
index 0a87614d745..2352d17b2f7 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -47,3 +47,4 @@ net-usb-smsc75xx-fix-uninit-value-access-in-__smsc75.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