Skip to content

Commit ec9f7bc

Browse files
committed
updpatch: linux-tools 6.19.5-1
Refresh patch.
1 parent 1f6753a commit ec9f7bc

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

linux-tools/riscv64.patch

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- PKGBUILD
22
+++ PKGBUILD
3-
@@ -5,15 +5,10 @@ pkgname=(
3+
@@ -6,15 +6,10 @@
44
'bootconfig'
55
'bpf'
66
'cpupower'
@@ -14,18 +14,9 @@
1414
'usbip'
1515
- 'x86_energy_perf_policy'
1616
)
17-
pkgver=6.12
18-
pkgrel=11
19-
@@ -69,6 +64,8 @@ sha256sums=('267bab84f30e3ce4a88b6441aeee777b114fd58041b43cabfe50fdf0c0a97321'
20-
prepare() {
21-
cd linux
22-
23-
+ git cherry-pick -n 710fbca820c721cdd60fa8c5bbe9deb4c0788aae
24-
+
25-
# apply patch from the source array (should be a pacman feature)
26-
local src
27-
for src in "${source[@]}"; do
28-
@@ -100,7 +97,8 @@ build() {
17+
pkgver=6.19.5
18+
pkgrel=1
19+
@@ -96,7 +91,8 @@
2920
NO_LIBLLVM=1 \
3021
PYTHON_CONFIG=python-config \
3122
LIBPFM4=1 \
@@ -35,59 +26,59 @@
3526
popd
3627

3728
echo ':: cpupower'
38-
@@ -108,11 +106,6 @@ build() {
29+
@@ -104,11 +100,6 @@
3930
make VERSION=$pkgver-$pkgrel
4031
popd
4132

4233
- echo ':: x86_energy_perf_policy'
43-
- pushd linux/tools/power/x86/x86_energy_perf_policy
34+
- pushd "$_srcname"/tools/power/x86/x86_energy_perf_policy
4435
- make
4536
- popd
4637
-
4738
echo ':: usbip'
48-
pushd linux/tools/usb/usbip
39+
pushd "$_srcname"/tools/usb/usbip
4940
# Fix gcc compilation
50-
@@ -127,21 +120,11 @@ build() {
41+
@@ -123,21 +114,11 @@
5142
make
5243
popd
5344

5445
- echo ':: turbostat'
55-
- pushd linux/tools/power/x86/turbostat
46+
- pushd "$_srcname"/tools/power/x86/turbostat
5647
- make
5748
- popd
5849
-
5950
- echo ':: hv'
60-
- pushd linux/tools/hv
51+
- pushd "$_srcname"/tools/hv
6152
- CFLAGS+=' -DKVP_SCRIPTS_PATH=\"/usr/lib/hypervkvpd/\"' make
6253
- popd
6354
-
6455
echo ':: bpf'
65-
pushd linux/tools/bpf
56+
pushd "$_srcname"/tools/bpf
6657
# doesn't compile when we don't first compile bpftool in its own directory and
6758
# man pages require to be also launch from the subdirectory
6859
- make -C bpftool all doc
6960
+ make -C bpftool all doc SRCARCH=riscv
7061
# runqslower, require kernel binary path to build, skip it
7162
make -W runqslower
7263
popd
73-
@@ -150,16 +133,6 @@ build() {
74-
pushd linux/tools/bootconfig
64+
@@ -146,16 +127,6 @@
65+
pushd "$_srcname"/tools/bootconfig
7566
make
7667
popd
7768
-
7869
- echo ':: intel-speed-select'
79-
- pushd linux/tools/power/x86/intel-speed-select
70+
- pushd "$_srcname"/tools/power/x86/intel-speed-select
8071
- make
8172
- popd
8273
-
8374
- echo ':: kcpuid'
84-
- pushd linux/tools/arch/x86/kcpuid
75+
- pushd "$_srcname"/tools/arch/x86/kcpuid
8576
- make
8677
- popd
8778
}
8879

8980
package_linux-tools-meta() {
90-
@@ -169,14 +142,9 @@ package_linux-tools-meta() {
81+
@@ -165,14 +136,9 @@
9182
'bootconfig'
9283
'bpf'
9384
'cpupower'
@@ -102,3 +93,11 @@
10293
)
10394
conflicts=(
10495
'acpidump'
96+
@@ -198,6 +164,7 @@
97+
PYTHON_CONFIG=python-config \
98+
DESTDIR="$pkgdir" \
99+
LIBPFM4=1 \
100+
+ SRCARCH=riscv \
101+
install install-python_ext
102+
cd "$pkgdir"
103+
# add linker search path

0 commit comments

Comments
 (0)