From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 20 Mar 2024 08:28:51 +0000 (+0100)
Subject: cpufrequtils: remove cpufrequtils
X-Git-Tag: v2.29-core186~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77bae935e6f5823d1527f5d97959c97b737e3379;p=ipfire-2.x.git

cpufrequtils: remove cpufrequtils

the only file in the package is now the initskript to configre powersave mode using cpupower
which is shipped with the kernel.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/packages/cpufrequtils b/config/rootfiles/packages/cpufrequtils
index d85e02867e..a058f370be 100644
--- a/config/rootfiles/packages/cpufrequtils
+++ b/config/rootfiles/packages/cpufrequtils
@@ -1,18 +1,2 @@
-usr/bin/cpufreq-aperf
-usr/bin/cpufreq-info
-usr/bin/cpufreq-set
-#usr/include/cpufreq.h
-#usr/lib/libcpufreq.a
-#usr/lib/libcpufreq.la
-usr/lib/libcpufreq.so
-usr/lib/libcpufreq.so.0
-usr/lib/libcpufreq.so.0.0.0
-#usr/man/man1/cpufreq-info.1
-#usr/man/man1/cpufreq-set.1
-#usr/share/locale/cs/LC_MESSAGES/cpufrequtils.mo
-usr/share/locale/de/LC_MESSAGES/cpufrequtils.mo
-#usr/share/locale/fr/LC_MESSAGES/cpufrequtils.mo
-#usr/share/locale/it/LC_MESSAGES/cpufrequtils.mo
-#usr/share/locale/pt/LC_MESSAGES/cpufrequtils.mo
 etc/rc.d/init.d/cpufreq
 etc/rc.d/rc3.d/S18cpufreq
diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils
index 8db0e67508..0383834b64 100644
--- a/lfs/cpufrequtils
+++ b/lfs/cpufrequtils
@@ -24,17 +24,17 @@
 
 include Config
 
-SUMMARY    = Tools to Determine and Set CPUfreq Settings
+SUMMARY    = compatiblity initscript to set ondemand/powersave gov via cpupower
 
-VER        = 008
+VER        = ipfire
 
 THISAPP    = cpufrequtils-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
+#DL_FILE    = $(THISAPP).tar.bz2
+#DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cpufrequtils
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       =
 
@@ -44,54 +44,26 @@ SERVICES   =
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 4543e0aa7fa5db8ce47db63d1770614c46ac4b2519162c2c0122d2156518d2741dc31888b89f1fce4b530c04497c9fa5bf4ac073f078828383a4cc433cc8301c
 
 install : $(TARGET)
 
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+check :
 
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
+download :
 
-b2 : $(subst %,%_BLAKE2,$(objects))
+b2 :
 
 dist:
 	@$(PAK)
 
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
 ###############################################################################
 # Installation Details
 ###############################################################################
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cpufrequtils/0007-po-add-missing-word-in-DE.patch
-
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make install
 
 	#install initscripts
 	$(call INSTALL_INITSCRIPTS,cpufreq)
 
-	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/initscripts/packages/cpufreq b/src/initscripts/packages/cpufreq
index 303eaf4bf4..ce71a4621c 100644
--- a/src/initscripts/packages/cpufreq
+++ b/src/initscripts/packages/cpufreq
@@ -54,16 +54,9 @@ case "${1}" in
 			echo_ok;
 			;;
 		esac
-		CPUCOUNT=`ls /sys/devices/system/cpu/cpu*/cpufreq/affected_cpus 2> /dev/null | wc -l `;
-		let CPUCOUNT-=1
-		# Set the governor to test if it works
-		cpufreq-set -g $GOV
+		# Set the governor
+		cpupower frequency-set -g $GOV >/dev/null
 		if [ ${?} = 0 ]; then
-			# Set the governor to ondemand for all cpus
-			for i in `seq 0 $CPUCOUNT`;
-			do
-				cpufreq-set -c $i -g $GOV > /dev/null
-			done
 			echo_ok;
 		else
 			echo_failure;