cpupower.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Oct  4 07:26:19 UTC 2024 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
-
-- Upstream fixed lib default installation path in 3a5bb5066f4c
-  [- cpupower_exclude_kernel_Makefile.patch] 
-
 -------------------------------------------------------------------
 Mon Apr 15 12:57:13 UTC 2024 - Thomas Renninger <trenn@suse.de>
 

cpupower.spec

@@ -32,6 +32,7 @@ License:        GPL-2.0-only
 Group:          System/Base
 URL:            https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git
 Patch1:         cpupower_fix_library_so_name.patch
+Patch3:         cpupower_exclude_kernel_Makefile.patch
 Patch6:         amd_do_not_show_amount_of_boost_states_if_zero.patch
 BuildRequires:  gettext-tools
 BuildRequires:  kernel-source
@@ -105,6 +106,7 @@ There is no reason to install this package.
 chmod +x tools/power/cpupower/utils/version-gen.sh
 %patch -P 1 -p1
 cd %{maindir}
+%patch -P 3 -p1
 %patch -P 6 -p1
 
 %build

cpupower_exclude_kernel_Makefile.patch

@@ -0,0 +1,19 @@
+Index: cpupower-5.5/Makefile
+===================================================================
+--- cpupower-5.5.orig/Makefile	2019-11-28 14:28:51.545762057 +0100
++++ cpupower-5.5/Makefile	2019-11-28 14:29:55.089765481 +0100
+@@ -94,14 +94,7 @@ 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
+ #