diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-12-02 09:52:11 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-12-02 09:53:48 +0000 |
| commit | 862c741a3ccc0936ce80840bad3937dec6a52c4d (patch) | |
| tree | 17c50031bdf772cd550ec3600fb4c2ba439a73f7 | |
| parent | fc0e71c84b2f87957a39905d17240097e8cb475f (diff) | |
| download | aports-862c741a3ccc0936ce80840bad3937dec6a52c4d.tar.bz2 aports-862c741a3ccc0936ce80840bad3937dec6a52c4d.tar.xz | |
main/cpufrequtils: apply upstream commits to fix arm build
and also the other issues we were already patching for.
10 files changed, 1804 insertions, 118 deletions
diff --git a/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch b/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch new file mode 100644 index 0000000000..d3bc14d51b --- /dev/null +++ b/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch @@ -0,0 +1,34 @@ +From f1b6bccf08f53295b2f7f448f28bbd37533c14a2 Mon Sep 17 00:00:00 2001 +From: Zhang Le <r0bertz@gentoo.org> +Date: Sun, 18 Jul 2010 02:05:28 +0800 +Subject: [PATCH 1/8] Only x86 has cpuid instruction + +Signed-off-by: Zhang Le <r0bertz@gentoo.org> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + utils/aperf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/aperf.c b/utils/aperf.c +index 627fb17..1c64501 100644 +--- a/utils/aperf.c ++++ b/utils/aperf.c +@@ -68,11 +68,15 @@ struct avg_perf_cpu_info + + static int cpu_has_effective_freq() + { ++#if defined(__i386__) || defined(__x86_64__) + /* largest base level */ + if (cpuid_eax(0) < 6) + return 0; + + return cpuid_ecx(6) & 0x1; ++#else ++ return 0; ++#endif + } + + /* +-- +1.7.10 + diff --git a/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch b/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch deleted file mode 100644 index b10d2e5635..0000000000 --- a/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4c6552d2df2912a710cab6acf476347a7fbf15a0 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 1 Sep 2010 09:12:44 +0000 -Subject: [PATCH] Support for Position Independet Code by aboid clobbering PIC register - -Do not use the PIC register (ebx) -See http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml#doc_chap5 ---- - utils/cpuid.h | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/utils/cpuid.h b/utils/cpuid.h -index 2bac69a..ebcec7c 100644 ---- a/utils/cpuid.h -+++ b/utils/cpuid.h -@@ -5,9 +5,12 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx, - unsigned int *ecx, unsigned int *edx) - { - /* ecx is often an input as well as an output. */ -- asm volatile("cpuid" -+ asm volatile( -+ "movl %%ebx, %%esi;" -+ "cpuid;" -+ "xchg %%ebx, %%esi;" - : "=a" (*eax), -- "=b" (*ebx), -+ "=S" (*ebx), - "=c" (*ecx), - "=d" (*edx) - : "0" (*eax), "2" (*ecx)); --- -1.7.2.2 - diff --git a/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch b/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch new file mode 100644 index 0000000000..b2ae533406 --- /dev/null +++ b/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch @@ -0,0 +1,1511 @@ +From adb7e044755aa06b12212d05c4acbcccb023d2cd Mon Sep 17 00:00:00 2001 +From: Thomas Renninger <trenn@suse.de> +Date: Wed, 1 Sep 2010 02:18:00 +0200 +Subject: [PATCH 2/8] cpufrequtils: Remove proc compile option and interfaces + +proc cpufreq kernel support is deprecated since the beginning of 2.6?) +If someone still likes to have support for the 2.4 cpufreq proc +interface one has to pick out an old cpufrequtils version +from now on... + +Signed-off-by: Thomas Renninger <trenn@suse.de> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + Makefile | 29 +------- + lib/cpufreq.c | 99 +++++-------------------- + lib/interfaces.h | 76 ------------------- + lib/proc.c | 216 ------------------------------------------------------ + lib/sysfs.h | 18 +++++ + po/cs.po | 186 +++++++++++++++++++++++++++------------------- + po/de.po | 2 +- + po/fr.po | 187 +++++++++++++++++++++++++++------------------- + po/it.po | 2 +- + po/pt.po | 2 +- + 10 files changed, 264 insertions(+), 553 deletions(-) + delete mode 100644 lib/interfaces.h + delete mode 100644 lib/proc.c + create mode 100644 lib/sysfs.h + +diff --git a/Makefile b/Makefile +index 3ef2af7..e23c644 100644 +--- a/Makefile ++++ b/Makefile +@@ -37,13 +37,6 @@ NLS ?= true + # cpufreq-bench benchmarking tool + CPUFRQ_BENCH ?= false + +-# Use the sysfs-based interface which is included in all 2.6 kernels +-# built with cpufreq support +-SYSFS ?= true +- +-# Use the proc-based interface which is used in the 2.4 patch for cpufreq +-PROC ?= true +- + # Prefix to the directories we're installing to + DESTDIR ?= + +@@ -119,24 +112,12 @@ CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \ + -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE + + UTIL_SRC = utils/info.c utils/set.c utils/aperf.c utils/cpuid.h +-LIB_HEADERS = lib/cpufreq.h lib/interfaces.h +-LIB_SRC = lib/cpufreq.c +-LIB_OBJS = lib/cpufreq.o ++LIB_HEADERS = lib/cpufreq.h lib/sysfs.h ++LIB_SRC = lib/cpufreq.c lib/sysfs.c ++LIB_OBJS = lib/cpufreq.o lib/sysfs.o + + CFLAGS += -pipe + +-ifeq ($(strip $(PROC)),true) +- LIB_OBJS += lib/proc.o +- LIB_SRC += lib/proc.c +- CPPFLAGS += -DINTERFACE_PROC +-endif +- +-ifeq ($(strip $(SYSFS)),true) +- LIB_OBJS += lib/sysfs.o +- LIB_SRC += lib/sysfs.c +- CPPFLAGS += -DINTERFACE_SYSFS +-endif +- + ifeq ($(strip $(NLS)),true) + INSTALL_NLS += install-gmo + COMPILE_NLS += update-gmo +@@ -183,10 +164,6 @@ lib/%.o: $(LIB_SRC) $(LIB_HEADERS) build/ccdv + $(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c lib/$*.c + + libcpufreq.so.$(LIB_MAJ): $(LIB_OBJS) +- @if [ $(strip $(SYSFS)) != true -a $(strip $(PROC)) != true ]; then \ +- echo '*** At least one of /sys support or /proc support MUST be enabled ***'; \ +- exit -1; \ +- fi; + $(QUIET) $(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ + -Wl,-soname,libcpufreq.so.$(LIB_MIN) $(LIB_OBJS) + @ln -sf $@ libcpufreq.so +diff --git a/lib/cpufreq.c b/lib/cpufreq.c +index 0c9f28e..603dbf8 100644 +--- a/lib/cpufreq.c ++++ b/lib/cpufreq.c +@@ -11,60 +11,39 @@ + #include <string.h> + + #include "cpufreq.h" +-#include "interfaces.h" ++#include "sysfs.h" + + int cpufreq_cpu_exists(unsigned int cpu) + { +- int ret = sysfs_cpu_exists(cpu); +- if (ret == -ENOSYS) +- ret = proc_cpu_exists(cpu); +- return (ret); ++ return sysfs_cpu_exists(cpu); + } + + unsigned long cpufreq_get_freq_kernel(unsigned int cpu) + { +- unsigned long ret = sysfs_get_freq_kernel(cpu); +- if (!ret) +- ret = proc_get_freq_kernel(cpu); +- return (ret); ++ return sysfs_get_freq_kernel(cpu); + } + + unsigned long cpufreq_get_freq_hardware(unsigned int cpu) + { +- unsigned long ret = sysfs_get_freq_hardware(cpu); +- if (!ret) +- ret = proc_get_freq_hardware(cpu); +- return (ret); ++ return sysfs_get_freq_hardware(cpu); + } + + unsigned long cpufreq_get_transition_latency(unsigned int cpu) + { +- unsigned long ret = sysfs_get_transition_latency(cpu); +- if (!ret) +- ret = proc_get_transition_latency(cpu); +- return (ret); ++ return sysfs_get_transition_latency(cpu); + } + + int cpufreq_get_hardware_limits(unsigned int cpu, + unsigned long *min, + unsigned long *max) + { +- int ret; + if ((!min) || (!max)) + return -EINVAL; +- ret = sysfs_get_hardware_limits(cpu, min, max); +- if (ret) +- ret = proc_get_hardware_limits(cpu, min, max); +- return (ret); ++ return sysfs_get_hardware_limits(cpu, min, max); + } + + char * cpufreq_get_driver(unsigned int cpu) { +- char * ret; +- ret = sysfs_get_driver(cpu); +- if (!ret) { +- ret = proc_get_driver(cpu); +- } +- return (ret); ++ return sysfs_get_driver(cpu); + } + + void cpufreq_put_driver(char * ptr) { +@@ -74,11 +53,7 @@ void cpufreq_put_driver(char * ptr) { + } + + struct cpufreq_policy * cpufreq_get_policy(unsigned int cpu) { +- struct cpufreq_policy * ret; +- ret = sysfs_get_policy(cpu); +- if (!ret) +- ret = proc_get_policy(cpu); +- return (ret); ++ return sysfs_get_policy(cpu); + } + + void cpufreq_put_policy(struct cpufreq_policy *policy) { +@@ -91,11 +66,7 @@ void cpufreq_put_policy(struct cpufreq_policy *policy) { + } + + struct cpufreq_available_governors * cpufreq_get_available_governors(unsigned int cpu) { +- struct cpufreq_available_governors *ret; +- ret = sysfs_get_available_governors(cpu); +- if (!ret) +- ret = proc_get_available_governors(cpu); +- return (ret); ++ return sysfs_get_available_governors(cpu); + } + + void cpufreq_put_available_governors(struct cpufreq_available_governors *any) { +@@ -116,11 +87,7 @@ void cpufreq_put_available_governors(struct cpufreq_available_governors *any) { + + + struct cpufreq_available_frequencies * cpufreq_get_available_frequencies(unsigned int cpu) { +- struct cpufreq_available_frequencies * ret; +- ret = sysfs_get_available_frequencies(cpu); +- if (!ret) +- ret = proc_get_available_frequencies(cpu); +- return (ret); ++ return sysfs_get_available_frequencies(cpu); + } + + void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any) { +@@ -139,11 +106,7 @@ void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any + + + struct cpufreq_affected_cpus * cpufreq_get_affected_cpus(unsigned int cpu) { +- struct cpufreq_affected_cpus * ret; +- ret = sysfs_get_affected_cpus(cpu); +- if (!ret) +- ret = proc_get_affected_cpus(cpu); +- return (ret); ++ return sysfs_get_affected_cpus(cpu); + } + + void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) { +@@ -162,11 +125,7 @@ void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) { + + + struct cpufreq_affected_cpus * cpufreq_get_related_cpus(unsigned int cpu) { +- struct cpufreq_affected_cpus * ret; +- ret = sysfs_get_related_cpus(cpu); +- if (!ret) +- ret = proc_get_related_cpus(cpu); +- return (ret); ++ return sysfs_get_related_cpus(cpu); + } + + void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) { +@@ -175,56 +134,32 @@ void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) { + + + int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { +- int ret; + if (!policy || !(policy->governor)) + return -EINVAL; + +- ret = sysfs_set_policy(cpu, policy); +- if (ret) +- ret = proc_set_policy(cpu, policy); +- return (ret); ++ return sysfs_set_policy(cpu, policy); + } + + + int cpufreq_modify_policy_min(unsigned int cpu, unsigned long min_freq) { +- int ret; +- +- ret = sysfs_modify_policy_min(cpu, min_freq); +- if (ret) +- ret = proc_modify_policy_min(cpu, min_freq); +- return (ret); ++ return sysfs_modify_policy_min(cpu, min_freq); + } + + + int cpufreq_modify_policy_max(unsigned int cpu, unsigned long max_freq) { +- int ret; +- +- ret = sysfs_modify_policy_max(cpu, max_freq); +- if (ret) +- ret = proc_modify_policy_max(cpu, max_freq); +- return (ret); ++ return sysfs_modify_policy_max(cpu, max_freq); + } + + + int cpufreq_modify_policy_governor(unsigned int cpu, char *governor) { +- int ret; +- + if ((!governor) || (strlen(governor) > 19)) + return -EINVAL; + +- ret = sysfs_modify_policy_governor(cpu, governor); +- if (ret) +- ret = proc_modify_policy_governor(cpu, governor); +- return (ret); ++ return sysfs_modify_policy_governor(cpu, governor); + } + + int cpufreq_set_frequency(unsigned int cpu, unsigned long target_frequency) { +- int ret; +- +- ret = sysfs_set_frequency(cpu, target_frequency); +- if (ret) +- ret = proc_set_frequency(cpu, target_frequency); +- return (ret); ++ return sysfs_set_frequency(cpu, target_frequency); + } + + struct cpufreq_stats * cpufreq_get_stats(unsigned int cpu, unsigned long long *total_time) { +diff --git a/lib/interfaces.h b/lib/interfaces.h +deleted file mode 100644 +index 67ee131..0000000 +--- a/lib/interfaces.h ++++ /dev/null +@@ -1,76 +0,0 @@ +-#ifdef INTERFACE_SYSFS +- +-extern unsigned int sysfs_cpu_exists(unsigned int cpu); +-extern unsigned long sysfs_get_freq_kernel(unsigned int cpu); +-extern unsigned long sysfs_get_freq_hardware(unsigned int cpu); +-extern unsigned long sysfs_get_transition_latency(unsigned int cpu); +-extern int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max); +-extern char * sysfs_get_driver(unsigned int cpu); +-extern struct cpufreq_policy * sysfs_get_policy(unsigned int cpu); +-extern struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu); +-extern struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu); +-extern struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu); +-extern struct cpufreq_affected_cpus * sysfs_get_related_cpus(unsigned int cpu); +-extern struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time); +-extern unsigned long sysfs_get_transitions(unsigned int cpu); +-extern int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy); +-extern int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq); +-extern int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq); +-extern int sysfs_modify_policy_governor(unsigned int cpu, char *governor); +-extern int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency); +- +-#else +- +-static inline unsigned int sysfs_cpu_exists(unsigned int cpu) { return -ENOSYS; } +-static inline unsigned long sysfs_get_freq_kernel(unsigned int cpu) { return 0; } +-static inline unsigned long sysfs_get_freq_hardware(unsigned int cpu) { return 0; } +-static inline unsigned long sysfs_get_transition_latency(unsigned int cpu) { return 0; } +-static inline int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max) { return -ENOSYS; } +-static inline char * sysfs_get_driver(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_policy * sysfs_get_policy(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_related_cpus * sysfs_get_affected_cpus(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time) { return NULL; } +-static inline unsigned long sysfs_get_transitions(unsigned int cpu) { return 0; } +-static inline int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { return -ENOSYS; } +-static inline int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq) { return -ENOSYS; } +-static inline int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq) { return -ENOSYS; } +-static inline int sysfs_modify_policy_governor(unsigned int cpu, char *governor) { return -ENOSYS; } +-static inline int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency) { return -ENOSYS; } +- +-#endif +- +- +-#ifdef INTERFACE_PROC +- +-extern int proc_cpu_exists(unsigned int cpu); +-extern unsigned long proc_get_freq_kernel(unsigned int cpu); +-extern struct cpufreq_policy * proc_get_policy(unsigned int cpu); +-extern int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy); +-extern int proc_set_frequency(unsigned int cpu, unsigned long target_frequency); +-#else +- +-static inline int proc_cpu_exists(unsigned int cpu) {return -ENOSYS; } +-static inline unsigned long proc_get_freq_kernel(unsigned int cpu) { return 0; } +-static inline struct cpufreq_policy * proc_get_policy(unsigned int cpu) { return NULL; } +-static inline int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { return -ENOSYS; } +-static inline int proc_set_frequency(unsigned int cpu, unsigned long target_frequency) { return -ENOSYS; } +- +-#endif +- +-/* these aren't implemented in /proc, and probably never will...*/ +- +-static inline unsigned long proc_get_freq_hardware(unsigned int cpu) { return 0; } +-static inline unsigned long proc_get_transition_latency(unsigned int cpu) { return -ENOSYS; } +-static inline int proc_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max) { return -ENOSYS; } +-static inline char * proc_get_driver(unsigned int cpu) {return NULL; } +-static inline struct cpufreq_available_governors * proc_get_available_governors(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_available_frequencies * proc_get_available_frequencies(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_affected_cpus * proc_get_affected_cpus(unsigned int cpu) { return NULL; } +-static inline struct cpufreq_affected_cpus * proc_get_related_cpus(unsigned int cpu) { return NULL; } +-static inline int proc_modify_policy_min(unsigned int cpu, unsigned long min_freq) { return -ENOSYS; } +-static inline int proc_modify_policy_max(unsigned int cpu, unsigned long max_freq) { return -ENOSYS; } +-static inline int proc_modify_policy_governor(unsigned int cpu, char *governor) { return -ENOSYS; } +- +diff --git a/lib/proc.c b/lib/proc.c +deleted file mode 100644 +index 38d8483..0000000 +--- a/lib/proc.c ++++ /dev/null +@@ -1,216 +0,0 @@ +-/* +- * (C) 2004 Dominik Brodowski <linux@dominikbrodowski.de> +- * +- * Licensed under the terms of the GNU GPL License version 2. +- */ +- +-#include <stdio.h> +-#include <errno.h> +-#include <stdlib.h> +-#include <string.h> +- +-#include "cpufreq.h" +- +-#define MAX_LINE_LEN 255 +- +-static int readout_proc_cpufreq(unsigned int cpu, unsigned long *min, unsigned long *max, char **governor) +-{ +- FILE *fp; +- char value[MAX_LINE_LEN]; +- char gov_value[MAX_LINE_LEN]; +- int ret = -ENODEV; +- unsigned int cpu_read; +- unsigned int tmp1, tmp2; +- +- if ((!min) || (!max) || (!governor)) +- return -EINVAL; +- +- fp = fopen("/proc/cpufreq","r"); +- if (!fp) +- return -ENODEV; +- +- +- if (!fgets(value, MAX_LINE_LEN, fp)) { +- ret = -EIO; +- goto error; +- } +- +- if (strlen(value) > (MAX_LINE_LEN - 10)) { +- ret = -EIO; +- goto error; +- } +- +- while(!feof(fp)) { +- if (!fgets(value, MAX_LINE_LEN, fp)) { +- ret = -EIO; +- goto error; +- } +- +- if (strlen(value) > (MAX_LINE_LEN - 10)) { +- ret = -EIO; +- goto error; +- } +- +- ret = sscanf(value, "CPU%3d %9lu kHz (%3d %%) - %9lu kHz (%3d %%) - %s", +- &cpu_read , min, &tmp1, max, &tmp2, gov_value); +- if (ret != 6) { +- ret = -EIO; +- goto error; +- } +- +- if (cpu_read != cpu) +- continue; +- +- if ((tmp2 < tmp1) || (tmp2 > 100) || (*max < *min)) { +- ret = -ENOSYS; +- goto error; +- } +- +- tmp1 = strlen(gov_value); +- if (tmp1 > 20) { +- ret = -ENOSYS; +- goto error; +- } +- +- *governor = malloc(sizeof(char) * (tmp1 + 2)); +- if (!*governor) { +- ret = -ENOMEM; +- goto error; +- } +- +- strncpy(*governor, gov_value, tmp1); +- (*governor)[tmp1] = '\0'; +- +- ret = 0; +- +- break; +- } +- +- error: +- fclose(fp); +- return (ret); +-} +- +-int proc_cpu_exists(unsigned int cpu) { +- unsigned long tmp1, tmp2; +- char *tmp3; +- int ret; +- +- ret = readout_proc_cpufreq(cpu, &tmp1, &tmp2, &tmp3); +- if (ret) +- return -ENODEV; +- +- free(tmp3); +- return 0; +-} +- +-struct cpufreq_policy * proc_get_policy(unsigned int cpu) { +- struct cpufreq_policy tmp; +- struct cpufreq_policy *ret; +- int err; +- +- err = readout_proc_cpufreq(cpu, &tmp.min, &tmp.max, &tmp.governor); +- if (err) +- return NULL; +- +- ret = malloc(sizeof(struct cpufreq_policy)); +- if (!ret) +- return NULL; +- +- ret->min = tmp.min; +- ret->max = tmp.max; +- ret->governor = tmp.governor; +- +- return (ret); +-} +- +-unsigned long proc_get_freq_kernel(unsigned int cpu) { +- FILE *fp; +- char value[MAX_LINE_LEN]; +- char file[MAX_LINE_LEN]; +- unsigned long value2; +- +- snprintf(file, MAX_LINE_LEN, "/proc/sys/cpu/%u/speed", cpu); +- +- fp = fopen(file,"r"); +- if (!fp) +- return 0; +- +- if (!fgets(value, MAX_LINE_LEN, fp)) { +- fclose(fp); +- return 0; +- } +- +- fclose(fp); +- +- if (strlen(value) > (MAX_LINE_LEN - 10)) { +- return 0; +- } +- +- if (sscanf(value, "%lu", &value2) != 1) +- return 0; +- +- return value2; +-} +- +-int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { +- FILE *fp; +- char value[MAX_LINE_LEN]; +- int ret = -ENODEV; +- +- if ((!policy) || (!policy->governor) || (strlen(policy->governor) > 15)) +- return -EINVAL; +- +- snprintf(value, MAX_LINE_LEN, "%d:%lu:%lu:%s", cpu, policy->min, policy->max, policy->governor); +- +- value[MAX_LINE_LEN - 1]='\0'; +- +- fp = fopen("/proc/cpufreq","r+"); +- if (!fp) +- return -ENODEV; +- ret = fputs(value, fp); +- fclose(fp); +- +- if (ret < 0) +- return (ret); +- +- return 0; +-} +- +-int proc_set_frequency(unsigned int cpu, unsigned long target_frequency) { +- struct cpufreq_policy *pol = proc_get_policy(cpu); +- struct cpufreq_policy new_pol; +- char userspace_gov[] = "userspace"; +- FILE *fp; +- char value[MAX_LINE_LEN]; +- char file[MAX_LINE_LEN]; +- int ret = 0; +- +- if (!pol) +- return -ENODEV; +- +- if (strncmp(pol->governor, userspace_gov, 9) != 0) { +- cpufreq_put_policy(pol); +- new_pol.min = pol->min; +- new_pol.max = pol->max; +- new_pol.governor = userspace_gov; +- ret = proc_set_policy(cpu, &new_pol); +- if (ret) +- return (ret); +- } +- +- +- snprintf(file, MAX_LINE_LEN, "/proc/sys/cpu/%u/speed", cpu); +- snprintf(value, MAX_LINE_LEN, "%lu", target_frequency); +- +- fp = fopen(file,"r+"); +- if (!fp) +- return -EINVAL; +- ret = fputs(value, fp); +- fclose(fp); +- +- if (ret < 0) +- return (ret); +- +- return 0; +-} +diff --git a/lib/sysfs.h b/lib/sysfs.h +new file mode 100644 +index 0000000..99619d5 +--- /dev/null ++++ b/lib/sysfs.h +@@ -0,0 +1,18 @@ ++extern unsigned int sysfs_cpu_exists(unsigned int cpu); ++extern unsigned long sysfs_get_freq_kernel(unsigned int cpu); ++extern unsigned long sysfs_get_freq_hardware(unsigned int cpu); ++extern unsigned long sysfs_get_transition_latency(unsigned int cpu); ++extern int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max); ++extern char * sysfs_get_driver(unsigned int cpu); ++extern struct cpufreq_policy * sysfs_get_policy(unsigned int cpu); ++extern struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu); ++extern struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu); ++extern struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu); ++extern struct cpufreq_affected_cpus * sysfs_get_related_cpus(unsigned int cpu); ++extern struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time); ++extern unsigned long sysfs_get_transitions(unsigned int cpu); ++extern int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy); ++extern int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq); ++extern int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq); ++extern int sysfs_modify_policy_governor(unsigned int cpu, char *governor); ++extern int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency); +diff --git a/po/cs.po b/po/cs.po +index a4c14a7..4fdfffb 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -9,7 +9,7 @@ msgid "" + msgstr "" + "Project-Id-Version: cs\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-07-17 11:29+0200\n" ++"POT-Creation-Date: 2010-09-01 01:20+0200\n" + "PO-Revision-Date: 2008-06-11 16:26+0200\n" + "Last-Translator: Karel Volný <kavol@seznam.cz>\n" + "Language-Team: Czech <diskuze@lists.l10n.cz>\n" +@@ -24,64 +24,74 @@ msgstr "" + msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n" + msgstr "Nelze zjistit počet CPU (%s: %s), předpokládá se 1.\n" + +-#: utils/info.c:67 ++#: utils/info.c:68 + #, c-format + msgid "" + " minimum CPU frequency - maximum CPU frequency - governor\n" + msgstr "" + " minimální frekvence CPU - maximální frekvence CPU - regulátor\n" + +-#: utils/info.c:128 ++#: utils/info.c:156 + #, c-format + msgid "couldn't analyze CPU %d as it doesn't seem to be present\n" + msgstr "nelze analyzovat CPU %d, vypadá to, že není přítomen\n" + +-#: utils/info.c:132 ++#: utils/info.c:160 + #, c-format + msgid "analyzing CPU %d:\n" + msgstr "analyzuji CPU %d:\n" + +-#: utils/info.c:139 ++#: utils/info.c:167 + #, c-format + msgid " no or unknown cpufreq driver is active on this CPU\n" + msgstr " pro tento CPU není aktivní žádný známý ovladač cpufreq\n" + +-#: utils/info.c:141 ++#: utils/info.c:169 + #, c-format + msgid " driver: %s\n" + msgstr " ovladač: %s\n" + +-#: utils/info.c:147 +-#, c-format +-msgid " CPUs which need to switch frequency at the same time: " ++#: utils/info.c:175 ++#, fuzzy, c-format ++msgid " CPUs which run at the same hardware frequency: " ++msgstr " CPU, které musí měnit frekvenci zároveň: " ++ ++#: utils/info.c:186 ++#, fuzzy, c-format ++msgid " CPUs which need to have their frequency coordinated by software: " + msgstr " CPU, které musí měnit frekvenci zároveň: " + +-#: utils/info.c:157 ++#: utils/info.c:197 ++#, c-format ++msgid " maximum transition latency: " ++msgstr "" ++ ++#: utils/info.c:203 + #, c-format + msgid " hardware limits: " + msgstr " hardwarové meze: " + +-#: utils/info.c:166 ++#: utils/info.c:212 + #, c-format + msgid " available frequency steps: " + msgstr " dostupné frekvence: " + +-#: utils/info.c:179 ++#: utils/info.c:225 + #, c-format + msgid " available cpufreq governors: " + msgstr " dostupné regulátory: " + +-#: utils/info.c:190 ++#: utils/info.c:236 + #, c-format + msgid " current policy: frequency should be within " + msgstr " současná taktika: frekvence by měla být mezi " + +-#: utils/info.c:192 ++#: utils/info.c:238 + #, c-format + msgid " and " + msgstr " a " + +-#: utils/info.c:196 ++#: utils/info.c:242 + #, c-format + msgid "" + "The governor \"%s\" may decide which speed to use\n" +@@ -90,51 +100,51 @@ msgstr "" + " Regulátor \"%s\" může rozhodnout jakou frekvenci použít\n" + " v těchto mezích.\n" + +-#: utils/info.c:203 ++#: utils/info.c:249 + #, c-format + msgid " current CPU frequency is " + msgstr " současná frekvence CPU je " + +-#: utils/info.c:206 ++#: utils/info.c:252 + #, c-format + msgid " (asserted by call to hardware)" + msgstr " (zjištěno hardwarovým voláním)" + +-#: utils/info.c:214 ++#: utils/info.c:260 + #, c-format + msgid " cpufreq stats: " + msgstr " statistika cpufreq: " + +-#: utils/info.c:361 utils/set.c:30 ++#: utils/info.c:440 utils/set.c:31 + #, c-format + msgid "Report errors and bugs to %s, please.\n" + msgstr "" + "Chyby v programu prosím hlaste na %s (anglicky).\n" + "Chyby v překladu prosím hlaste na kavol@seznam.cz (česky ;-)\n" + +-#: utils/info.c:365 ++#: utils/info.c:444 + #, c-format + msgid "Usage: cpufreq-info [options]\n" + msgstr "Užití: cpufreq-info [přepínače]\n" + +-#: utils/info.c:366 utils/set.c:35 ++#: utils/info.c:445 utils/set.c:37 + #, c-format + msgid "Options:\n" + msgstr "Přepínače:\n" + +-#: utils/info.c:367 ++#: utils/info.c:446 + #, c-format + msgid "" + " -c CPU, --cpu CPU CPU number which information shall be determined " + "about\n" + msgstr " -c CPU, --cpu CPU Číslo CPU, o kterém se mají zjistit informace\n" + +-#: utils/info.c:368 ++#: utils/info.c:447 + #, c-format + msgid " -e, --debug Prints out debug information\n" + msgstr " -e, --debug Vypíše ladicí informace\n" + +-#: utils/info.c:369 ++#: utils/info.c:448 + #, c-format + msgid "" + " -f, --freq Get frequency the CPU currently runs at, according\n" +@@ -143,7 +153,7 @@ msgstr "" + " -f, --freq Zjistí aktuální frekvenci, na které CPU běží\n" + " podle cpufreq *\n" + +-#: utils/info.c:371 ++#: utils/info.c:450 + #, c-format + msgid "" + " -w, --hwfreq Get frequency the CPU currently runs at, by reading\n" +@@ -152,7 +162,7 @@ msgstr "" + " -w, --hwfreq Zjistí aktuální frekvenci, na které CPU běží\n" + " z hardware (dostupné jen uživateli root) *\n" + +-#: utils/info.c:373 ++#: utils/info.c:452 + #, c-format + msgid "" + " -l, --hwlimits Determine the minimum and maximum CPU frequency " +@@ -161,36 +171,52 @@ msgstr "" + " -l, --hwlimits Zjistí minimální a maximální dostupnou frekvenci CPU " + "*\n" + +-#: utils/info.c:374 ++#: utils/info.c:453 + #, c-format + msgid " -d, --driver Determines the used cpufreq kernel driver *\n" + msgstr " -d, --driver Zjistí aktivní ovladač cpufreq *\n" + +-#: utils/info.c:375 ++#: utils/info.c:454 + #, c-format + msgid " -p, --policy Gets the currently used cpufreq policy *\n" + msgstr " -p, --policy Zjistí aktuální taktiku cpufreq *\n" + +-#: utils/info.c:376 ++#: utils/info.c:455 + #, c-format + msgid " -g, --governors Determines available cpufreq governors *\n" + msgstr " -g, --governors Zjistí dostupné regulátory cpufreq *\n" + +-#: utils/info.c:377 +-#, c-format ++#: utils/info.c:456 ++#, fuzzy, c-format + msgid "" +-" -a, --affected-cpus Determines which CPUs can only switch frequency at " +-"the\n" +-" same time *\n" ++" -r, --related-cpus Determines which CPUs run at the same hardware " ++"frequency *\n" + msgstr "" + " -a, --affected-cpus Zjistí, které CPU musí měnit frekvenci zároveň *\n" + +-#: utils/info.c:379 ++#: utils/info.c:457 ++#, fuzzy, c-format ++msgid "" ++" -a, --affected-cpus Determines which CPUs need to have their frequency\n" ++" coordinated by software *\n" ++msgstr "" ++" -a, --affected-cpus Zjistí, které CPU musí měnit frekvenci zároveň *\n" ++ ++#: utils/info.c:459 + #, c-format + msgid " -s, --stats Shows cpufreq statistics if available\n" + msgstr " -s, --stats Zobrazí statistiku cpufreq, je-li dostupná\n" + +-#: utils/info.c:380 ++#: utils/info.c:460 ++#, fuzzy, c-format ++msgid "" ++" -y, --latency Determines the maximum latency on CPU frequency " ++"changes *\n" ++msgstr "" ++" -l, --hwlimits Zjistí minimální a maximální dostupnou frekvenci CPU " ++"*\n" ++ ++#: utils/info.c:461 + #, c-format + msgid "" + " -o, --proc Prints out information like provided by the /proc/" +@@ -200,21 +226,21 @@ msgstr "" + " -o, --proc Vypíše informace ve formátu, jaký používalo rozhraní\n" + " /proc/cpufreq v kernelech řady 2.4 a časné 2.6\n" + +-#: utils/info.c:382 +-#, c-format ++#: utils/info.c:463 ++#, fuzzy, c-format + msgid "" +-" -m, --human human-readable output for the -f, -w and -s " ++" -m, --human human-readable output for the -f, -w, -s and -y " + "parameters\n" + msgstr "" + " -m, --human Výstup parametrů -f, -w a -s v „lidmi čitelném“ " + "formátu\n" + +-#: utils/info.c:383 utils/set.c:42 ++#: utils/info.c:464 + #, c-format + msgid " -h, --help Prints out this screen\n" + msgstr " -h, --help Vypíše tuto nápovědu\n" + +-#: utils/info.c:386 ++#: utils/info.c:467 + #, c-format + msgid "" + "If no argument or only the -c, --cpu parameter is given, debug output about\n" +@@ -224,7 +250,7 @@ msgstr "" + "jsou\n" + "vypsány ladicí informace, což může být užitečné například při hlášení chyb.\n" + +-#: utils/info.c:388 ++#: utils/info.c:469 + #, c-format + msgid "" + "For the arguments marked with *, omitting the -c or --cpu argument is\n" +@@ -233,14 +259,14 @@ msgstr "" + "Není-li při použití přepínačů označených * zadán parametr -c nebo --cpu,\n" + "předpokládá se jeho hodnota 0.\n" + +-#: utils/info.c:478 ++#: utils/info.c:563 + #, c-format + msgid "" + "The argument passed to this tool can't be combined with passing a --cpu " + "argument\n" + msgstr "Zadaný parametr nemůže být použit zároveň s přepínačem -c nebo --cpu\n" + +-#: utils/info.c:491 ++#: utils/info.c:576 + #, c-format + msgid "" + "You can't specify more than one --cpu parameter and/or\n" +@@ -249,17 +275,17 @@ msgstr "" + "Nelze zadat více než jeden parametr -c nebo --cpu\n" + "anebo více než jeden parametr určující výstup\n" + +-#: utils/info.c:497 utils/set.c:79 ++#: utils/info.c:582 utils/set.c:95 + #, c-format + msgid "invalid or unknown argument\n" + msgstr "neplatný nebo neznámý parametr\n" + +-#: utils/set.c:34 ++#: utils/set.c:36 + #, c-format + msgid "Usage: cpufreq-set [options]\n" + msgstr "Užití: cpufreq-set [přepínače]\n" + +-#: utils/set.c:36 ++#: utils/set.c:38 + #, c-format + msgid "" + " -c CPU, --cpu CPU number of CPU where cpufreq settings shall be " +@@ -268,7 +294,7 @@ msgstr "" + " -c CPU, --cpu CPU Číslo CPU pro který se má provést nastavení " + "cpufreq\n" + +-#: utils/set.c:37 ++#: utils/set.c:39 + #, c-format + msgid "" + " -d FREQ, --min FREQ new minimum CPU frequency the governor may " +@@ -277,7 +303,7 @@ msgstr "" + " -d FREQ, --min FREQ Nová nejnižší frekvence, kterou může regulátor " + "vybrat\n" + +-#: utils/set.c:38 ++#: utils/set.c:40 + #, c-format + msgid "" + " -u FREQ, --max FREQ new maximum CPU frequency the governor may " +@@ -286,12 +312,12 @@ msgstr "" + " -u FREQ, --max FREQ Nová nejvyšší frekvence, kterou může regulátor " + "zvolit\n" + +-#: utils/set.c:39 ++#: utils/set.c:41 + #, c-format + msgid " -g GOV, --governor GOV new cpufreq governor\n" + msgstr " -g GOV, --governors GOV Nový regulátor cpufreq\n" + +-#: utils/set.c:40 ++#: utils/set.c:42 + #, c-format + msgid "" + " -f FREQ, --freq FREQ specific frequency to be set. Requires userspace\n" +@@ -303,6 +329,16 @@ msgstr "" + + #: utils/set.c:44 + #, c-format ++msgid " -r, --related Switches all hardware-related CPUs\n" ++msgstr "" ++ ++#: utils/set.c:45 ++#, fuzzy, c-format ++msgid " -h, --help Prints out this screen\n" ++msgstr " -h, --help Vypíše tuto nápovědu\n" ++ ++#: utils/set.c:47 ++#, c-format + msgid "" + "Notes:\n" + "1. Omitting the -c or --cpu argument is equivalent to setting it to zero\n" +@@ -322,30 +358,7 @@ msgstr "" + " připojením názvu jednotky bez mezery mezi číslem a jednotkou\n" + " (FREQ v kHz =^ Hz * 0,001 = ^ MHz * 1000 =^ GHz * 1000000)\n" + +-#: utils/set.c:251 +-#, c-format +-msgid "" +-"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n" +-"-g/--governor parameters\n" +-msgstr "" +-"přepínač -f/--freq nemůže být použit zároveň\n" +-"s přepínačem -d/--min, -u/--max nebo -g/--governor\n" +- +-#: utils/set.c:262 +-#, c-format +-msgid "" +-"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n" +-"-g/--governor must be passed\n" +-msgstr "" +-"Musí být zadán alespoň jeden přepínač\n" +-"-f/--freq, -d/--min, -u/--max nebo -g/--governor\n" +- +-#: utils/set.c:282 +-#, c-format +-msgid "wrong, unknown or unhandled CPU?\n" +-msgstr "neznámý nebo nepodporovaný CPU?\n" +- +-#: utils/set.c:306 ++#: utils/set.c:69 + #, c-format + msgid "" + "Error setting new values. Common errors:\n" +@@ -365,3 +378,26 @@ msgstr "" + "- Snažíte se nastavit určitou frekvenci, ale není dostupný\n" + " regulátor ‚userspace‘, například protože není nahrán v jádře,\n" + " nebo nelze na tomto hardware nastavit určitou frekvenci?\n" ++ ++#: utils/set.c:183 ++#, c-format ++msgid "wrong, unknown or unhandled CPU?\n" ++msgstr "neznámý nebo nepodporovaný CPU?\n" ++ ++#: utils/set.c:336 ++#, c-format ++msgid "" ++"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n" ++"-g/--governor parameters\n" ++msgstr "" ++"přepínač -f/--freq nemůže být použit zároveň\n" ++"s přepínačem -d/--min, -u/--max nebo -g/--governor\n" ++ ++#: utils/set.c:342 ++#, c-format ++msgid "" ++"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n" ++"-g/--governor must be passed\n" ++msgstr "" ++"Musí být zadán alespoň jeden přepínač\n" ++"-f/--freq, -d/--min, -u/--max nebo -g/--governor\n" +diff --git a/po/de.po b/po/de.po +index 4c3a2bb..a5970ae 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: cpufrequtils 006\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-08-09 11:53+0200\n" ++"POT-Creation-Date: 2010-09-01 01:20+0200\n" + "PO-Revision-Date: 2009-08-08 17:18+0100\n" + "Last-Translator: <linux@dominikbrodowski.net>\n" + "Language-Team: NONE\n" +diff --git a/po/fr.po b/po/fr.po +index fffdb42..4ebb40b 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: cpufrequtils 0.1-pre2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-07-17 11:29+0200\n" ++"POT-Creation-Date: 2010-09-01 01:20+0200\n" + "PO-Revision-Date: 2004-11-17 15:53+1000\n" + "Last-Translator: Bruno Ducrot <ducrot@poupinou.org>\n" + "Language-Team: NONE\n" +@@ -21,64 +21,74 @@ msgstr "" + msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n" + msgstr "Dtermination du nombre de CPUs (%s : %s) impossible. Assume 1\n" + +-#: utils/info.c:67 ++#: utils/info.c:68 + #, c-format + msgid "" + " minimum CPU frequency - maximum CPU frequency - governor\n" + msgstr "" + " Frquence CPU minimale - Frquence CPU maximale - rgulateur\n" + +-#: utils/info.c:128 ++#: utils/info.c:156 + #, c-format + msgid "couldn't analyze CPU %d as it doesn't seem to be present\n" + msgstr "analyse du CPU %d impossible puisqu'il ne semble pas tre prsent\n" + +-#: utils/info.c:132 ++#: utils/info.c:160 + #, c-format + msgid "analyzing CPU %d:\n" + msgstr "analyse du CPU %d :\n" + +-#: utils/info.c:139 ++#: utils/info.c:167 + #, c-format + msgid " no or unknown cpufreq driver is active on this CPU\n" + msgstr " pas de pilotes cpufreq reconnu pour ce CPU\n" + +-#: utils/info.c:141 ++#: utils/info.c:169 + #, c-format + msgid " driver: %s\n" + msgstr " pilote : %s\n" + +-#: utils/info.c:147 +-#, c-format +-msgid " CPUs which need to switch frequency at the same time: " ++#: utils/info.c:175 ++#, fuzzy, c-format ++msgid " CPUs which run at the same hardware frequency: " ++msgstr " CPUs qui doivent changer de frquences en mme temps : " ++ ++#: utils/info.c:186 ++#, fuzzy, c-format ++msgid " CPUs which need to have their frequency coordinated by software: " + msgstr " CPUs qui doivent changer de frquences en mme temps : " + +-#: utils/info.c:157 ++#: utils/info.c:197 ++#, c-format ++msgid " maximum transition latency: " ++msgstr "" ++ ++#: utils/info.c:203 + #, c-format + msgid " hardware limits: " + msgstr " limitation matrielle : " + +-#: utils/info.c:166 ++#: utils/info.c:212 + #, c-format + msgid " available frequency steps: " + msgstr " plage de frquence : " + +-#: utils/info.c:179 ++#: utils/info.c:225 + #, c-format + msgid " available cpufreq governors: " + msgstr " rgulateurs disponibles : " + +-#: utils/info.c:190 ++#: utils/info.c:236 + #, c-format + msgid " current policy: frequency should be within " + msgstr " tactique actuelle : la frquence doit tre comprise entre " + +-#: utils/info.c:192 ++#: utils/info.c:238 + #, c-format + msgid " and " + msgstr " et " + +-#: utils/info.c:196 ++#: utils/info.c:242 + #, c-format + msgid "" + "The governor \"%s\" may decide which speed to use\n" +@@ -87,37 +97,37 @@ msgstr "" + "Le rgulateur \"%s\" est libre de choisir la vitesse\n" + " dans cette plage de frquences.\n" + +-#: utils/info.c:203 ++#: utils/info.c:249 + #, c-format + msgid " current CPU frequency is " + msgstr " la frquence actuelle de ce CPU est " + +-#: utils/info.c:206 ++#: utils/info.c:252 + #, c-format + msgid " (asserted by call to hardware)" + msgstr " (vrifi par un appel direct du matriel)" + +-#: utils/info.c:214 ++#: utils/info.c:260 + #, c-format + msgid " cpufreq stats: " + msgstr " des statistique concernant cpufreq:" + +-#: utils/info.c:361 utils/set.c:30 ++#: utils/info.c:440 utils/set.c:31 + #, c-format + msgid "Report errors and bugs to %s, please.\n" + msgstr "Veuillez rapportez les erreurs et les bogues %s, s'il vous plait.\n" + +-#: utils/info.c:365 ++#: utils/info.c:444 + #, c-format + msgid "Usage: cpufreq-info [options]\n" + msgstr "Usage : cpufreq-info [options]\n" + +-#: utils/info.c:366 utils/set.c:35 ++#: utils/info.c:445 utils/set.c:37 + #, c-format + msgid "Options:\n" + msgstr "Options :\n" + +-#: utils/info.c:367 ++#: utils/info.c:446 + #, c-format + msgid "" + " -c CPU, --cpu CPU CPU number which information shall be determined " +@@ -126,12 +136,12 @@ msgstr "" + " -c CPU, --cpu CPU Numro du CPU pour lequel l'information sera " + "affiche\n" + +-#: utils/info.c:368 ++#: utils/info.c:447 + #, c-format + msgid " -e, --debug Prints out debug information\n" + msgstr " -e, --debug Afficher les informations de dboguage\n" + +-#: utils/info.c:369 ++#: utils/info.c:448 + #, c-format + msgid "" + " -f, --freq Get frequency the CPU currently runs at, according\n" +@@ -140,7 +150,7 @@ msgstr "" + " -f, --freq Obtenir la frquence actuelle du CPU selon le point\n" + " de vue du coeur du systme de cpufreq *\n" + +-#: utils/info.c:371 ++#: utils/info.c:450 + #, c-format + msgid "" + " -w, --hwfreq Get frequency the CPU currently runs at, by reading\n" +@@ -149,7 +159,7 @@ msgstr "" + " -w, --hwfreq Obtenir la frquence actuelle du CPU directement par\n" + " le matriel (doit tre root) *\n" + +-#: utils/info.c:373 ++#: utils/info.c:452 + #, c-format + msgid "" + " -l, --hwlimits Determine the minimum and maximum CPU frequency " +@@ -158,40 +168,57 @@ msgstr "" + " -l, --hwlimits Affiche les frquences minimales et maximales du CPU " + "*\n" + +-#: utils/info.c:374 ++#: utils/info.c:453 + #, c-format + msgid " -d, --driver Determines the used cpufreq kernel driver *\n" + msgstr " -d, --driver Affiche le pilote cpufreq utilis *\n" + +-#: utils/info.c:375 ++#: utils/info.c:454 + #, c-format + msgid " -p, --policy Gets the currently used cpufreq policy *\n" + msgstr " -p, --policy Affiche la tactique actuelle de cpufreq *\n" + +-#: utils/info.c:376 ++#: utils/info.c:455 + #, c-format + msgid " -g, --governors Determines available cpufreq governors *\n" + msgstr "" + " -g, --governors Affiche les rgulateurs disponibles de cpufreq *\n" + +-#: utils/info.c:377 +-#, c-format ++#: utils/info.c:456 ++#, fuzzy, c-format + msgid "" +-" -a, --affected-cpus Determines which CPUs can only switch frequency at " +-"the\n" +-" same time *\n" ++" -r, --related-cpus Determines which CPUs run at the same hardware " ++"frequency *\n" + msgstr "" + " -a, --affected-cpus Affiche quels sont les CPUs qui doivent changer de\n" + " frquences en mme temps *\n" + +-#: utils/info.c:379 ++#: utils/info.c:457 ++#, fuzzy, c-format ++msgid "" ++" -a, --affected-cpus Determines which CPUs need to have their frequency\n" ++" coordinated by software *\n" ++msgstr "" ++" -a, --affected-cpus Affiche quels sont les CPUs qui doivent changer de\n" ++" frquences en mme temps *\n" ++ ++#: utils/info.c:459 + #, c-format + msgid " -s, --stats Shows cpufreq statistics if available\n" + msgstr "" + " -s, --stats Indique des statistiques concernant cpufreq, si\n" + " disponibles\n" + +-#: utils/info.c:380 ++#: utils/info.c:460 ++#, fuzzy, c-format ++msgid "" ++" -y, --latency Determines the maximum latency on CPU frequency " ++"changes *\n" ++msgstr "" ++" -l, --hwlimits Affiche les frquences minimales et maximales du CPU " ++"*\n" ++ ++#: utils/info.c:461 + #, c-format + msgid "" + " -o, --proc Prints out information like provided by the /proc/" +@@ -203,21 +230,21 @@ msgstr "" + "versions\n" + " 2.4 et les anciennes versions 2.6 du noyau\n" + +-#: utils/info.c:382 +-#, c-format ++#: utils/info.c:463 ++#, fuzzy, c-format + msgid "" +-" -m, --human human-readable output for the -f, -w and -s " ++" -m, --human human-readable output for the -f, -w, -s and -y " + "parameters\n" + msgstr "" + " -m, --human affiche dans un format lisible pour un humain\n" + " pour les options -f, -w et -s (MHz, GHz)\n" + +-#: utils/info.c:383 utils/set.c:42 ++#: utils/info.c:464 + #, c-format + msgid " -h, --help Prints out this screen\n" + msgstr " -h, --help affiche l'aide-mmoire\n" + +-#: utils/info.c:386 ++#: utils/info.c:467 + #, c-format + msgid "" + "If no argument or only the -c, --cpu parameter is given, debug output about\n" +@@ -227,21 +254,21 @@ msgstr "" + "argument, ou bien si seulement l'argument -c (--cpu) est donn, afin de\n" + "faciliter les rapports de bogues par exemple\n" + +-#: utils/info.c:388 ++#: utils/info.c:469 + #, c-format + msgid "" + "For the arguments marked with *, omitting the -c or --cpu argument is\n" + "equivalent to setting it to zero\n" + msgstr "Les arguments avec un * utiliseront le CPU 0 si -c (--cpu) est omis\n" + +-#: utils/info.c:478 ++#: utils/info.c:563 + #, c-format + msgid "" + "The argument passed to this tool can't be combined with passing a --cpu " + "argument\n" + msgstr "Cette option est incompatible avec --cpu\n" + +-#: utils/info.c:491 ++#: utils/info.c:576 + #, c-format + msgid "" + "You can't specify more than one --cpu parameter and/or\n" +@@ -250,17 +277,17 @@ msgstr "" + "On ne peut indiquer plus d'un paramtre --cpu, tout comme l'on ne peut\n" + "spcifier plus d'un argument de formatage\n" + +-#: utils/info.c:497 utils/set.c:79 ++#: utils/info.c:582 utils/set.c:95 + #, c-format + msgid "invalid or unknown argument\n" + msgstr "option invalide\n" + +-#: utils/set.c:34 ++#: utils/set.c:36 + #, c-format + msgid "Usage: cpufreq-set [options]\n" + msgstr "Usage : cpufreq-set [options]\n" + +-#: utils/set.c:36 ++#: utils/set.c:38 + #, c-format + msgid "" + " -c CPU, --cpu CPU number of CPU where cpufreq settings shall be " +@@ -269,7 +296,7 @@ msgstr "" + " -c CPU, --cpu CPU numro du CPU prendre en compte pour les\n" + " changements\n" + +-#: utils/set.c:37 ++#: utils/set.c:39 + #, c-format + msgid "" + " -d FREQ, --min FREQ new minimum CPU frequency the governor may " +@@ -278,7 +305,7 @@ msgstr "" + " -d FREQ, --min FREQ nouvelle frquence minimale du CPU utiliser\n" + " par le rgulateur\n" + +-#: utils/set.c:38 ++#: utils/set.c:40 + #, c-format + msgid "" + " -u FREQ, --max FREQ new maximum CPU frequency the governor may " +@@ -287,12 +314,12 @@ msgstr "" + " -u FREQ, --max FREQ nouvelle frquence maximale du CPU utiliser\n" + " par le rgulateur\n" + +-#: utils/set.c:39 ++#: utils/set.c:41 + #, c-format + msgid " -g GOV, --governor GOV new cpufreq governor\n" + msgstr " -g GOV, --governor GOV active le rgulateur GOV\n" + +-#: utils/set.c:40 ++#: utils/set.c:42 + #, c-format + msgid "" + " -f FREQ, --freq FREQ specific frequency to be set. Requires userspace\n" +@@ -304,6 +331,16 @@ msgstr "" + + #: utils/set.c:44 + #, c-format ++msgid " -r, --related Switches all hardware-related CPUs\n" ++msgstr "" ++ ++#: utils/set.c:45 ++#, fuzzy, c-format ++msgid " -h, --help Prints out this screen\n" ++msgstr " -h, --help affiche l'aide-mmoire\n" ++ ++#: utils/set.c:47 ++#, c-format + msgid "" + "Notes:\n" + "1. Omitting the -c or --cpu argument is equivalent to setting it to zero\n" +@@ -322,30 +359,7 @@ msgstr "" + " les valeurs par hz, kHz (par dfaut), MHz, GHz ou THz\n" + " (kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n" + +-#: utils/set.c:251 +-#, c-format +-msgid "" +-"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n" +-"-g/--governor parameters\n" +-msgstr "" +-"l'option -f/--freq est incompatible avec les options -d/--min, -u/--max et\n" +-"-g/--governor\n" +- +-#: utils/set.c:262 +-#, c-format +-msgid "" +-"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n" +-"-g/--governor must be passed\n" +-msgstr "" +-"L'un de ces paramtres est obligatoire : -f/--freq, -d/--min, -u/--max et\n" +-"-g/--governor\n" +- +-#: utils/set.c:282 +-#, c-format +-msgid "wrong, unknown or unhandled CPU?\n" +-msgstr "CPU inconnu ou non support ?\n" +- +-#: utils/set.c:306 ++#: utils/set.c:69 + #, c-format + msgid "" + "Error setting new values. Common errors:\n" +@@ -368,3 +382,26 @@ msgstr "" + "- vous voulez utiliser l'option -f/--freq, mais le rgulateur userspace \n" + " n'est pas disponible, par exemple parce que le matriel ne le supporte\n" + " pas, ou bien n'est tout simplement pas charg.\n" ++ ++#: utils/set.c:183 ++#, c-format ++msgid "wrong, unknown or unhandled CPU?\n" ++msgstr "CPU inconnu ou non support ?\n" ++ ++#: utils/set.c:336 ++#, c-format ++msgid "" ++"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n" ++"-g/--governor parameters\n" ++msgstr "" ++"l'option -f/--freq est incompatible avec les options -d/--min, -u/--max et\n" ++"-g/--governor\n" ++ ++#: utils/set.c:342 ++#, c-format ++msgid "" ++"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n" ++"-g/--governor must be passed\n" ++msgstr "" ++"L'un de ces paramtres est obligatoire : -f/--freq, -d/--min, -u/--max et\n" ++"-g/--governor\n" +diff --git a/po/it.po b/po/it.po +index 36f09ed..4e9aa83 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: cpufrequtils 0.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-08-09 11:53+0200\n" ++"POT-Creation-Date: 2010-09-01 01:20+0200\n" + "PO-Revision-Date: 2009-08-15 12:00+0900\n" + "Last-Translator: Mattia Dongili <malattia@gmail.com>\n" + "Language-Team: NONE\n" +diff --git a/po/pt.po b/po/pt.po +index 75cca0d..2baf1d5 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: cpufrequtils 004\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-08-09 11:53+0200\n" ++"POT-Creation-Date: 2010-09-01 01:20+0200\n" + "PO-Revision-Date: 2008-06-14 22:16-0400\n" + "Last-Translator: Claudio Eduardo <claudioeddy@gmail.com>\n" + "MIME-Version: 1.0\n" +-- +1.7.10 + diff --git a/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch b/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch new file mode 100644 index 0000000000..308e73a5b6 --- /dev/null +++ b/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch @@ -0,0 +1,35 @@ +From d4490efed068a552e8b67d52a0726458a224c9a0 Mon Sep 17 00:00:00 2001 +From: Frank Arnold <frank.arnold@amd.com> +Date: Wed, 8 Dec 2010 17:39:14 +0100 +Subject: [PATCH 3/8] cpufrequtils aperf: Fix MSR read on 32-bit + +The cpufreq-aperf command does not work on 32-bit systems. The reason +for that is a wrong count argument passed to the read() call. Instead +of the buffer size, the size of the pointer to the buffer is used. On +64-bit systems this just happened to work, because we need to read an +8 byte value and a pointer has a size of 8 bytes on 64-bit. On 32-bit +systems only 4 bytes are read, which then triggers the error path. + +Signed-off-by: Frank Arnold <frank.arnold@amd.com> +Reviewed-by: Thomas Renninger <trenn@suse.de> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + utils/aperf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/aperf.c b/utils/aperf.c +index 1c64501..6302f5a 100644 +--- a/utils/aperf.c ++++ b/utils/aperf.c +@@ -100,7 +100,7 @@ static int read_msr(int cpu, unsigned int idx, unsigned long long *val) + return -1; + if (lseek(fd, idx, SEEK_CUR) == -1) + goto err; +- if (read(fd, val, sizeof val) != sizeof *val) ++ if (read(fd, val, sizeof *val) != sizeof *val) + goto err; + close(fd); + return 0; +-- +1.7.10 + diff --git a/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch b/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch new file mode 100644 index 0000000000..94088300f9 --- /dev/null +++ b/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch @@ -0,0 +1,29 @@ +From 9f2efa7bc6969c10562ac2c720d50ff77083e5c2 Mon Sep 17 00:00:00 2001 +From: Roman Vasiyarov <rvasiyarov@gmail.com> +Date: Mon, 25 Apr 2011 21:34:23 +0400 +Subject: [PATCH 5/8] cpufrequtils sysfs: increase MAX_LINE_LEN + +larger sysfs data (>255 bytes) was truncated and thus used improperly + +Signed-off-by: Roman Vasiyarov <rvasiyarov@gmail.com> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + lib/sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/sysfs.c b/lib/sysfs.c +index 4e0edab..24dd563 100644 +--- a/lib/sysfs.c ++++ b/lib/sysfs.c +@@ -18,7 +18,7 @@ + #include "cpufreq.h" + + #define PATH_TO_CPU "/sys/devices/system/cpu/" +-#define MAX_LINE_LEN 255 ++#define MAX_LINE_LEN 4096 + #define SYSFS_PATH_MAX 255 + + /* helper function to read file from /sys into given buffer */ +-- +1.7.10 + diff --git a/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch b/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch new file mode 100644 index 0000000000..ee3adff75a --- /dev/null +++ b/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch @@ -0,0 +1,46 @@ +From 9085ce6f615d9d2e0182d3ce029b882835bd0a6b Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Tue, 26 Jul 2011 19:28:31 -0400 +Subject: [PATCH 6/8] aperf: fix compilation on x86-32 with -fPIC + +ebx is used to store the GOT pointer when compiled with -fPIC, so it's +not usable by inline assembly. + +https://bugs.gentoo.org/375967 + +Signed-off-by: Matt Turner <mattst88@gmail.com> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + utils/cpuid.h | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/utils/cpuid.h b/utils/cpuid.h +index 2bac69a..53da789 100644 +--- a/utils/cpuid.h ++++ b/utils/cpuid.h +@@ -5,9 +5,21 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx, + unsigned int *ecx, unsigned int *edx) + { + /* ecx is often an input as well as an output. */ +- asm volatile("cpuid" ++ asm volatile( ++#if defined(__i386__) && defined(__PIC__) ++ "push %%ebx\n" ++ "cpuid\n" ++ "movl %%ebx, %1\n" ++ "pop %%ebx\n" ++#else ++ "cpuid\n" ++#endif + : "=a" (*eax), ++#if defined(__i386__) && defined(__PIC__) ++ "=r" (*ebx), ++#else + "=b" (*ebx), ++#endif + "=c" (*ecx), + "=d" (*edx) + : "0" (*eax), "2" (*ecx)); +-- +1.7.10 + diff --git a/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch b/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch new file mode 100644 index 0000000000..d116791b14 --- /dev/null +++ b/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch @@ -0,0 +1,28 @@ +From 26ce99ab92ae9f1f367a58b7858a96f4e1e6814c Mon Sep 17 00:00:00 2001 +From: Dominik Brodowski <linux@dominikbrodowski.net> +Date: Fri, 29 Jul 2011 19:40:46 +0200 +Subject: [PATCH 7/8] po: add missing word in DE + +Reported-by: Michael Basse +Reported-by: <tkranz@zedat.fu-berlin.de> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + po/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/de.po b/po/de.po +index 1da1f2b..ee793f5 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -304,7 +304,7 @@ msgid "" + "modified\n" + msgstr "" + " -c CPU, --cpu CPU Nummer der CPU, deren Taktfrequenz-Einstellung\n" +-" werden soll\n" ++" verndert werden soll\n" + + #: utils/set.c:39 + #, c-format +-- +1.7.10 + diff --git a/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch b/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch new file mode 100644 index 0000000000..03724f1ef0 --- /dev/null +++ b/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch @@ -0,0 +1,88 @@ +From a2f0c39d5f21596bb9f5223e895c0ff210b265d0 Mon Sep 17 00:00:00 2001 +From: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com> +Date: Sat, 13 Aug 2011 23:02:20 -0400 +Subject: [PATCH 8/8] cpufrequtils: make NLS optional + +https://bugs.gentoo.org/205576 + +Signed-off-by: Matt Turner <mattst88@gmail.com> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + Makefile | 1 + + utils/info.c | 10 +++++++++- + utils/set.c | 10 +++++++++- + 3 files changed, 19 insertions(+), 2 deletions(-) + +Index: cpufrequtils/Makefile +=================================================================== +--- cpufrequtils.orig/Makefile 2012-05-06 13:30:41.865796974 +0900 ++++ cpufrequtils/Makefile 2012-05-06 13:35:13.994099919 +0900 +@@ -140,6 +140,7 @@ + ifeq ($(strip $(NLS)),true) + INSTALL_NLS += install-gmo + COMPILE_NLS += update-gmo ++ CPPFLAGS += -DNLS + endif + + ifeq ($(strip $(CPUFRQ_BENCH)),true) +Index: cpufrequtils/utils/info.c +=================================================================== +--- cpufrequtils.orig/utils/info.c 2012-05-06 11:56:20.287842838 +0900 ++++ cpufrequtils/utils/info.c 2012-05-06 13:35:13.994099919 +0900 +@@ -10,7 +10,6 @@ + #include <errno.h> + #include <stdlib.h> + #include <string.h> +-#include <libintl.h> + #include <locale.h> + + #include <getopt.h> +@@ -18,9 +17,18 @@ + #include "cpufreq.h" + + ++#ifdef NLS ++#include <libintl.h> + #define _(String) gettext (String) + #define gettext_noop(String) String + #define N_(String) gettext_noop (String) ++#else ++#define gettext_noop(String) String ++#define _(String) gettext_noop (String) ++#define gettext(String) gettext_noop (String) ++#define N_(String) gettext_noop (String) ++#define textdomain(String) ++#endif + + #define LINE_LEN 10 + +Index: cpufrequtils/utils/set.c +=================================================================== +--- cpufrequtils.orig/utils/set.c 2012-05-06 11:56:20.287842838 +0900 ++++ cpufrequtils/utils/set.c 2012-05-06 13:35:13.994099919 +0900 +@@ -12,16 +12,24 @@ + #include <limits.h> + #include <string.h> + #include <ctype.h> +-#include <libintl.h> + #include <locale.h> + + #include <getopt.h> + + #include "cpufreq.h" + ++#ifdef NLS ++#include <libintl.h> + #define _(String) gettext(String) + #define gettext_noop(String) String + #define N_(String) gettext_noop(String) ++#else ++#define gettext_noop(String) String ++#define _(String) gettext_noop (String) ++#define gettext(String) gettext_noop (String) ++#define N_(String) gettext_noop (String) ++#define textdomain(String) ++#endif + + #define NORM_FREQ_LEN 32 + diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD index 01e33737e2..a4d73eddd0 100644 --- a/main/cpufrequtils/APKBUILD +++ b/main/cpufrequtils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cpufrequtils pkgver=008 -pkgrel=2 +pkgrel=3 pkgdesc="Userspace tools for the kernel cpufreq subsystem" url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" arch="all" @@ -10,18 +10,26 @@ subpackages="$pkgname-dev $pkgname-doc" depends="sysfsutils" makedepends="sysfsutils-dev libtool" source="ftp://ftp.archlinux.org/other/cpufrequtils/cpufrequtils-$pkgver.tar.bz2 - cpufrequtils-006-nls.patch - 0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch + 0001-Only-x86-has-cpuid-instruction.patch + 0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch + 0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch + 0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch + 0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch + 0007-po-add-missing-word-in-DE.patch + 0008-cpufrequtils-make-NLS-optional.patch $pkgname.initd $pkgname.confd" -build() { +prepare() { cd "$srcdir"/$pkgname-$pkgver for i in ../*.patch; do msg "Applying $i..." patch -p1 < $i || return 1 done +} +build() { + cd "$srcdir"/$pkgname-$pkgver # distcc and ccache makes libtool confused about the tag. # we save 4k by disabling the 2.4 kernel support (PROC=false) make -j1 LIBTOOL_OPT="--tag=CC --silent" \ @@ -42,17 +50,32 @@ package() { } md5sums="c59b71c044d463896f3247e8dd83dd7e cpufrequtils-008.tar.bz2 -aa4c6f19766a741a68ae1ad352c6bad9 cpufrequtils-006-nls.patch -9f999b70138d84580894df48340e50cc 0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch +9ed71a50670aa99e12245cb3f5199142 0001-Only-x86-has-cpuid-instruction.patch +4ccbd46b0b1563067d0c31fe510ff89d 0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch +5dd9add84e63b213295e2e2a30fd3667 0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch +139b340b964e2c942dbe426b061c6bc8 0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch +2242f015ca6b8478d6c1a3bfbca5ea48 0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch +0b7d50274fa8286796c9df0b156e2962 0007-po-add-missing-word-in-DE.patch +a99653aab0d334569496a402389f062f 0008-cpufrequtils-make-NLS-optional.patch b9b80ef2f1b6c5e7ce0476037a8bce6b cpufrequtils.initd d47ff635eef03248c633486eaeec191d cpufrequtils.confd" sha256sums="1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1 cpufrequtils-008.tar.bz2 -fb60cf2543461af3f47ea85927be5d5242489da99a32801ed8beea65a21472b4 cpufrequtils-006-nls.patch -3501d2e07ed7a7609d93d40428057935a08cb84f7b46882710d6b4cf966c1749 0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch +6793e7e330fe6c9125c998011f203a4d8d5887872178fc872861db1d5dce55ef 0001-Only-x86-has-cpuid-instruction.patch +62efd52ea004e1974a09cc5646fbc18d47b372a54ed33361fb2c8470bd931501 0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch +5ef9bae9272f867c0187ba0b4845888cf6bb567a4a242da5001b3a4a05935a2c 0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch +76038bb0197d02c91b7dfde5e65cab9379526bba02cb2bab751bbf23a63b392e 0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch +99b2b04301f1656ea263e5d693be701be8af40880747fd3e34c9c27e5540eefa 0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch +245f1c9db3f8120eb014f782476df6a38c22700dd438d532943ad35f4e4ca46d 0007-po-add-missing-word-in-DE.patch +bb1cba04abb42843085ea4f2b38d539cfe7d4db93ffaca453891ee2de6c6feac 0008-cpufrequtils-make-NLS-optional.patch af83b2354bd8876efecd85762a61a40a4b498633e186cb85db7a22389936a2e6 cpufrequtils.initd 602b65f6e9927bfb37a26a34c1b44bd4a87cdb2977b5547398e17432afe55727 cpufrequtils.confd" sha512sums="d25dcc4fbf15bdca65a3fab6ee33d6cf4b7ab7ed291aea42ed7970b707535ddfcd27fd0189aa48affc2792abf72539f1388cc544019e6fc06353a2f9c5a49d17 cpufrequtils-008.tar.bz2 -26e2c9e273b084eb64b38b187064a560d05479026522912390054fdbc99eaba55ca682a59884bc67f013c3ce9d7b80e5ba765351765d921c0c66573287f1db52 cpufrequtils-006-nls.patch -827e9b73902f50c9bce75b76cd33759a627837705dc92520ab360e95cc9b242a76c5d59cd9eea83cd6d2c832b97f74f3e3ac31f3bfef82d36fa0a55266e7ec72 0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch +4d841bdf2b829518932505747e68d661219337259c1321cdd6671faf2eb72ff6d7f437e42b98f093f9d6564d2bb7be1d4ab645f08b0fbd58ce43339a12be37da 0001-Only-x86-has-cpuid-instruction.patch +6d8c6beb98d680d4d47c5cc0a067545b1683f259b7d2474a61876b5e97987be30b8d212017122157236ae91bd415793e5f5a0d22214bfc3f2ec72cf626d28832 0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch +41082f5ed4cc2962927b12b8dcf4b0dadf6fb227b66b8f383931c7ae0416fa5f73e765664376b50e07948e48060770a7d32bc7422b144c0cb82166515e197f9b 0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch +00fb946b1f0b42038297b9cf63740a4123a4aafa5292400225803ef8cd6f1e89b387509c2f74fa6223b3b2b3032b6e0edcbfc3b6bf15aab73bb480c0208330b9 0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch +7e924424fe3381fd804edfcb0c0c98e73b67e4da7972c7cfe0bc9cfb5febd2ec660f4e84b6bebe2b0b6d2dc5e60279ebe85d1892905b1112ee43d60b46bcdef5 0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch +69343ab9c9b795523bcd09359f4acdb279510a95c6aa13f70be1d0e2e89ed59952a34f979969f6a3ac3498ad7196ee1c810677fe2d04c5f02207682b820b97bb 0007-po-add-missing-word-in-DE.patch +5d5eab9815d77b8ae9c6c9d122f52da7501068b9a6fe7766e74a8f59d1296c0bcb6e5a61a643e371e2e1433912d48205c8f522207144bb02a3c9961043eb968b 0008-cpufrequtils-make-NLS-optional.patch a9a1023ad5d55b9050a392a8c05e29dbf1ed9bcdcd8e82063d38adc2a81a86e306ffd7aaf048518a1ca427b4ffcd0ca9410fbd5ae5defe648512e81366caecaa cpufrequtils.initd 81adc035c781c2c6f94fdb9a69dfb5d867830ab0685f2badce055b9f8095881456522fc0cd5386140d920fd1d9b96c82d8dcecd9962e3e6ef5f9be926153802b cpufrequtils.confd" diff --git a/main/cpufrequtils/cpufrequtils-006-nls.patch b/main/cpufrequtils/cpufrequtils-006-nls.patch deleted file mode 100644 index 7d1c24dbd5..0000000000 --- a/main/cpufrequtils/cpufrequtils-006-nls.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/Makefile b/Makefile -index 19f3dd6..b7f1e56 100644 ---- a/Makefile -+++ b/Makefile -@@ -147,6 +147,7 @@ endif - ifeq ($(strip $(NLS)),true) - INSTALL_NLS += install-gmo - COMPILE_NLS += update-gmo -+ CFLAGDEF += -DNLS - endif - - ifeq ($(strip $(CPUFRQ_BENCH)),true) -diff --git a/utils/info.c b/utils/info.c -index 38d906a..155e604 100644 ---- a/utils/info.c -+++ b/utils/info.c -@@ -10,7 +10,6 @@ - #include <errno.h> - #include <stdlib.h> - #include <string.h> --#include <libintl.h> - #include <locale.h> - - #include <getopt.h> -@@ -18,9 +17,18 @@ - #include "cpufreq.h" - - -+#ifdef NLS -+#include <libintl.h> - #define _(String) gettext (String) - #define gettext_noop(String) String - #define N_(String) gettext_noop (String) -+#else -+#define gettext_noop(String) String -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define LINE_LEN 10 - -diff --git a/utils/set.c b/utils/set.c -index 2ece47e..312cc8c 100644 ---- a/utils/set.c -+++ b/utils/set.c -@@ -12,16 +12,24 @@ - #include <limits.h> - #include <string.h> - #include <ctype.h> --#include <libintl.h> - #include <locale.h> - - #include <getopt.h> - - #include "cpufreq.h" - --#define _(String) gettext(String) -+#ifdef NLS -+#include <libintl.h> -+#define _(String) gettext (String) -+#define gettext_noop(String) String -+#define N_(String) gettext_noop (String) -+#else - #define gettext_noop(String) String --#define N_(String) gettext_noop(String) -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define NORM_FREQ_LEN 32 - |