From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 31 Jan 2025 09:05:32 +0000 (+0100)
Subject: 6.13-stable patches
X-Git-Tag: v6.13.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95bc7ecfc611a2b8bd6274df86f49e9009762a0f;p=thirdparty%2Fkernel%2Fstable-queue.git

6.13-stable patches

added patches:
	pm-cpupower-makefile-fix-cross-compilation.patch
---

diff --git a/queue-6.13/pm-cpupower-makefile-fix-cross-compilation.patch b/queue-6.13/pm-cpupower-makefile-fix-cross-compilation.patch
new file mode 100644
index 0000000000..eaf8ac1493
--- /dev/null
+++ b/queue-6.13/pm-cpupower-makefile-fix-cross-compilation.patch
@@ -0,0 +1,53 @@
+From 3075476a7af666de3ec10b4f35d8e62db8fd5b6d Mon Sep 17 00:00:00 2001
+From: Peng Fan <peng.fan@nxp.com>
+Date: Fri, 29 Nov 2024 09:20:05 +0800
+Subject: pm: cpupower: Makefile: Fix cross compilation
+
+From: Peng Fan <peng.fan@nxp.com>
+
+commit 3075476a7af666de3ec10b4f35d8e62db8fd5b6d upstream.
+
+After commit f79473ed9220 ("pm: cpupower: Makefile: Allow overriding
+cross-compiling env params") we would fail to cross compile cpupower in
+buildroot which uses the recipe at [1] where only the CROSS variable is
+being set.
+
+The issue here is the use of the lazy evaluation for all variables: CC,
+LD, AR, STRIP, RANLIB, rather than just CROSS.
+
+[1]:
+https://git.buildroot.net/buildroot/tree/package/linux-tools/linux-tool-cpupower.mk.in
+
+Fixes: f79473ed9220 ("pm: cpupower: Makefile: Allow overriding cross-compiling env params")
+Reported-by: Florian Fainelli <florian.fainelli@broadcom.com>
+Closes: https://lore.kernel.org/all/2bbabd2c-24ef-493c-a199-594e5dada3da@broadcom.com/
+Signed-off-by: Peng Fan <peng.fan@nxp.com>
+Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
+Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/power/cpupower/Makefile |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/tools/power/cpupower/Makefile
++++ b/tools/power/cpupower/Makefile
+@@ -87,11 +87,19 @@ INSTALL_SCRIPT = ${INSTALL} -m 644
+ # to something more interesting, like "arm-linux-".  If you want
+ # to compile vs uClibc, that can be done here as well.
+ CROSS ?= #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
++ifneq ($(CROSS), )
++CC = $(CROSS)gcc
++LD = $(CROSS)gcc
++AR = $(CROSS)ar
++STRIP = $(CROSS)strip
++RANLIB = $(CROSS)ranlib
++else
+ CC ?= $(CROSS)gcc
+ LD ?= $(CROSS)gcc
+ AR ?= $(CROSS)ar
+ STRIP ?= $(CROSS)strip
+ RANLIB ?= $(CROSS)ranlib
++endif
+ HOSTCC = gcc
+ MKDIR = mkdir
+ 
diff --git a/queue-6.13/series b/queue-6.13/series
index 461ffcf238..3271b2bdd9 100644
--- a/queue-6.13/series
+++ b/queue-6.13/series
@@ -24,3 +24,4 @@ input-xpad-improve-name-of-8bitdo-controller-2dc8-3106.patch
 input-xpad-add-support-for-nacon-evol-x-xbox-one-controller.patch
 input-xpad-add-support-for-wooting-two-he-arm.patch
 drm-v3d-assign-job-pointer-to-null-before-signaling-the-fence.patch
+pm-cpupower-makefile-fix-cross-compilation.patch