diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre-tools/01-cpupower-governor-fix.patch | 31 | ||||
| -rw-r--r-- | libre/linux-libre-tools/PKGBUILD | 12 |
2 files changed, 4 insertions, 39 deletions
diff --git a/libre/linux-libre-tools/01-cpupower-governor-fix.patch b/libre/linux-libre-tools/01-cpupower-governor-fix.patch deleted file mode 100644 index 714319ea0..000000000 --- a/libre/linux-libre-tools/01-cpupower-governor-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c -index b4bf769..f2d1bbd 100644 ---- a/tools/power/cpupower/utils/cpufreq-set.c -+++ b/tools/power/cpupower/utils/cpufreq-set.c -@@ -296,9 +296,10 @@ int cmd_freq_set(int argc, char **argv) - struct cpufreq_affected_cpus *cpus; - - if (!bitmask_isbitset(cpus_chosen, cpu) || -- cpupower_is_cpu_online(cpu)) -+ cpupower_is_cpu_online(cpu) != 1) - continue; - -+ - cpus = cpufreq_get_related_cpus(cpu); - if (!cpus) - break; -@@ -316,11 +317,10 @@ int cmd_freq_set(int argc, char **argv) - cpu <= bitmask_last(cpus_chosen); cpu++) { - - if (!bitmask_isbitset(cpus_chosen, cpu) || -- cpupower_is_cpu_online(cpu)) -- continue; -- -- if (cpupower_is_cpu_online(cpu) != 1) -+ cpupower_is_cpu_online(cpu) != 1) { -+ printf(_("Ignoring cpu: %d\n"), cpu); - continue; -+ } - - printf(_("Setting cpu: %d\n"), cpu); - ret = do_one_cpu(cpu, &new_pol, freq, policychange); diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 34dc196a6..21742645e 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -17,7 +17,7 @@ _pkgname=( ) pkgname=("${pkgbase}-meta" "${_pkgname[@]/#/${pkgbase}-}") -_pkgbasever=4.8-gnu +_pkgbasever=4.9-gnu _pkgver=${_pkgbasever} _srcname=linux-${_pkgbasever%-*} @@ -47,15 +47,13 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l 'cpupower.default' 'cpupower.systemd' 'cpupower.service' - 'usbipd.service' - '01-cpupower-governor-fix.patch') -sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a' + 'usbipd.service') +sha256sums=('009039b8e4cd63c547f0f7d09ce109ba8c534a015c53bebdc25d3f09474143f4' 'SKIP' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'd2e8e5e8b22c6089a91f573aa1c59e442a1f3b67a2c9f047abe3b57d3d6558cc' 'fa2560630576464739ede14c9292249f4007f36a684bc378add174fc88394550' - '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' - '0952a7519d9ccd0254d5f384b9420eb8f7f64da3d13607b57b305ad79d6c2007') + '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -67,8 +65,6 @@ prepare() { if [ "${_pkgbasever}" != "${_pkgver}" ]; then patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}" fi - - patch -N -p1 -i "$srcdir/01-cpupower-governor-fix.patch" } build() { |