summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/linux-libre-tools/01-cpupower-governor-fix.patch31
-rw-r--r--libre/linux-libre-tools/02-parabola-paths.patch21
-rw-r--r--libre/linux-libre-tools/04-fix-usip-h-path.patch13
-rw-r--r--libre/linux-libre-tools/PKGBUILD48
-rw-r--r--libre/linux-libre-tools/cpupower.service1
-rw-r--r--libre/linux-libre-tools/cpupower.systemd2
6 files changed, 55 insertions, 61 deletions
diff --git a/libre/linux-libre-tools/01-cpupower-governor-fix.patch b/libre/linux-libre-tools/01-cpupower-governor-fix.patch
new file mode 100644
index 000000000..714319ea0
--- /dev/null
+++ b/libre/linux-libre-tools/01-cpupower-governor-fix.patch
@@ -0,0 +1,31 @@
+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/02-parabola-paths.patch b/libre/linux-libre-tools/02-parabola-paths.patch
deleted file mode 100644
index e16ea43b5..000000000
--- a/libre/linux-libre-tools/02-parabola-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# Seblu was here
---- a/tools/perf/config/Makefile 2014-02-13 23:00:14.000000000 +0100
-+++ b/tools/perf/config/Makefile 2014-02-17 20:01:33.370539725 +0100
-@@ -561,7 +561,7 @@
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--perfexecdir = libexec/perf-core
-+perfexecdir = lib/perf
- sharedir = $(prefix)/share
- template_dir = share/perf-core/templates
- htmldir = share/doc/perf-doc
-@@ -573,7 +573,7 @@
- ETC_PERFCONFIG = etc/perfconfig
- endif
- ifeq ($(ARCH)$(IS_64_BIT), x861)
--lib = lib64
-+lib = lib
- else
- lib = lib
- endif
diff --git a/libre/linux-libre-tools/04-fix-usip-h-path.patch b/libre/linux-libre-tools/04-fix-usip-h-path.patch
deleted file mode 100644
index 2d9abce0a..000000000
--- a/libre/linux-libre-tools/04-fix-usip-h-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2014 Sébastien Luttringer
-
---- a/tools/usb/usbip/libsrc/usbip_common.h 2014-10-06 02:13:09.295856364 +0200
-+++ b/tools/usb/usbip/libsrc/usbip_common.h 2014-10-06 02:13:03.607873728 +0200
-@@ -15,7 +15,7 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <linux/usb/ch9.h>
--#include <linux/usbip.h>
-+#include "../../../include/uapi/linux/usbip.h"
-
- #ifndef USBIDS_FILE
- #define USBIDS_FILE "/usr/share/hwdata/usb.ids"
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 529495d62..35f1c2b41 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.7-gnu
+_pkgbasever=4.8-gnu
_pkgver=${_pkgbasever}
_srcname=linux-${_pkgbasever%-*}
@@ -48,16 +48,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'cpupower.systemd'
'cpupower.service'
'usbipd.service'
- '02-parabola-paths.patch'
- '04-fix-usip-h-path.patch')
-sha256sums=('f483e595e0ad9a9d1b3afd20e4ecb0b798cf16eb31e79a7b99311eb9c061032a'
+ '01-cpupower-governor-fix.patch')
+sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a'
'SKIP'
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
- 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
- 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
+ 'd2e8e5e8b22c6089a91f573aa1c59e442a1f3b67a2c9f047abe3b57d3d6558cc'
+ 'fa2560630576464739ede14c9292249f4007f36a684bc378add174fc88394550'
'2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
- '91f7d91d4270f207102c469c575dd176c3be7897d78d26057d047db164eaf9ca'
- 'e5543d8d6d3fbc7f8d9d25c428a882737d2e0169455f70cbc3f73076ff33dd5d')
+ '0952a7519d9ccd0254d5f384b9420eb8f7f64da3d13607b57b305ad79d6c2007')
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
)
@@ -70,8 +68,7 @@ prepare() {
patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
fi
- patch -N -p1 -i "$srcdir/02-parabola-paths.patch"
- patch -N -p1 -i "$srcdir/04-fix-usip-h-path.patch"
+ patch -N -p1 -i "$srcdir/01-cpupower-governor-fix.patch"
}
build() {
@@ -82,17 +79,14 @@ build() {
msg2 'perf'
pushd $_srcname/tools/perf
- if [ "$CARCH" = "x86_64" ]; then
- extra='NO_PERF_READ_VDSO32=1'
- fi
- make \
- WERROR=0 \
- DESTDIR="$pkgdir/usr" \
- perfexecdir='lib/perf' \
+ make -f Makefile.perf \
+ prefix=/usr \
+ lib=lib/perf \
+ perfexecdir=lib/perf \
+ NO_SDT=1 \
PYTHON=python2 \
PYTHON_CONFIG=python2-config \
PERF_VERSION=$pkgver-$pkgrel \
- $extra \
all man
popd
@@ -155,18 +149,22 @@ _package_perf() {
optdepends=('gtk2: support GTK2 browser for perf report')
cd $_srcname/tools/perf
- make \
- WERROR=0 \
- DESTDIR="$pkgdir/usr" \
- perfexecdir='lib/perf' \
+ make -f Makefile.perf \
+ prefix=/usr \
+ lib=lib/perf \
+ perfexecdir=lib/perf \
+ NO_SDT=1 \
PYTHON=python2 \
PYTHON_CONFIG=python2-config \
PERF_VERSION=$pkgver-$pkgrel \
+ DESTDIR="$pkgdir" \
install install-man
- # move completion in new directory
cd "$pkgdir"
- install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/completions/perf
- rm -r usr/etc
+ # move completion in new directory
+ install -Dm644 etc/bash_completion.d/perf usr/share/bash-completion/completions/perf
+ rm -r etc
+ # no exec on usr/share
+ find usr/share -type f -exec chmod a-x {} \;
}
_package_cpupower() {
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
index aaeba2b08..06e03e537 100644
--- a/libre/linux-libre-tools/cpupower.service
+++ b/libre/linux-libre-tools/cpupower.service
@@ -3,6 +3,7 @@ Description=Apply cpupower configuration
[Service]
Type=oneshot
+EnvironmentFile=/etc/default/cpupower
ExecStart=/usr/lib/systemd/scripts/cpupower
RemainAfterExit=yes
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
index 51c645415..5439ad581 100644
--- a/libre/linux-libre-tools/cpupower.systemd
+++ b/libre/linux-libre-tools/cpupower.systemd
@@ -1,7 +1,5 @@
#!/bin/bash
-. /etc/default/cpupower
-
declare -i fail=0
# parse frequency options
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-26 17:47:17 +0000