aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2021-03-03 21:08:08 +0000
committerMilan P. Stanić <mps@arvanta.net>2021-03-04 06:56:28 +0000
commit93b2b55a59034fabc8ce3aaab9b1fac33ae94f9d (patch)
treee89eb6868748b4909685dbc7aabbc0d6c9b19410
parent135db1391d7cafb7f8831c6b9c2fabf98a558878 (diff)
downloadaports-93b2b55a59034fabc8ce3aaab9b1fac33ae94f9d.tar.gz
aports-93b2b55a59034fabc8ce3aaab9b1fac33ae94f9d.tar.bz2
aports-93b2b55a59034fabc8ce3aaab9b1fac33ae94f9d.tar.xz
community/linux-tools: upgrade to 5.10.19
build tmon (thermal monitor) subpackage, add needed patch and ncurses-dev to makedepends for it
-rw-r--r--community/linux-tools/APKBUILD22
-rw-r--r--community/linux-tools/tmon-musl-includes.patch17
2 files changed, 33 insertions, 6 deletions
diff --git a/community/linux-tools/APKBUILD b/community/linux-tools/APKBUILD
index e23831b74f..96ede1e28c 100644
--- a/community/linux-tools/APKBUILD
+++ b/community/linux-tools/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=linux-tools
-pkgver=5.10.17
+pkgver=5.10.19
_kernver=${pkgver%.*}
pkgrel=0
pkgdesc="Linux kernel tools meta package"
@@ -13,11 +13,13 @@ license="GPL-2.0-only"
depends="perf cpupower $pkgname-gpio $pkgname-iio"
depends_dev="pciutils-dev readline-dev gettext-dev"
makedepends="$depends_dev elfutils-dev bash linux-headers flex bison diffutils
- zlib-dev findutils python3"
+ zlib-dev findutils python3 ncurses-dev"
subpackages="perf perf-bash-completion:bashcomp:noarch cpupower cpupower-openrc
- $pkgname-gpio $pkgname-iio $pkgname-doc $pkgname-dev"
+ $pkgname-gpio $pkgname-iio $pkgname-doc $pkgname-dev
+ tmon"
source="https://kernel.org/pub/linux/kernel/v5.x/linux-$_kernver.tar.xz
https://kernel.org/pub/linux/kernel/v5.x/patch-$pkgver.xz
+ tmon-musl-includes.patch
cpupower-libs.patch
cpupower.initd
cpupower.confd
@@ -42,14 +44,15 @@ _make_tools() {
}
build() {
- _make_tools perf cpupower gpio iio
+ _make_tools perf cpupower gpio iio tmon
}
package() {
mkdir -p "$pkgdir"
_make_tools DESTDIR="$pkgdir" \
perf_install cpupower_install gpio_install iio_install
-
+ ( cd tools/thermal/tmon;
+ make install INSTALL_ROOT="$pkgdir"; )
mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
}
@@ -97,6 +100,12 @@ iio() {
mv "$pkgdir"/usr/bin/*iio* "$subpkgdir"/usr/bin
}
+tmon() {
+ pkgdesc="Linux kernel thermal monitor tools"
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/tmon "$subpkgdir"/usr/bin
+}
+
bashcomp() {
replaces="$pkgname-bash-completion" # Backward compatibility
pkgdesc="Bash autocompletion for $pkgname"
@@ -106,7 +115,8 @@ bashcomp() {
}
sha512sums="95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
-ca800a311bbe5a3179fb7c097d590991eb80395e240b08bcceae671ca3270a19f87ce3ee76533b2d974b8329b506992dfe2b3f53fd15829e118d75c6e6d8e09b patch-5.10.17.xz
+9637f8dac379ffa6d376afcce8da87250eb48a6a2ffac0e5732884cca2cc2f0a85811fc326f006d2d297680ff7dcf726665360d9c7d5d34307bc3e7169ce6a7a patch-5.10.19.xz
+15d6d80e9ed2cdea3bb09574f1cf524007b088699204cfc9d326edd9cf461a38300cfafd82dae4a5a78a179944ef10f51ed7d51c3a8aeb8c08e7c6754d9e123b tmon-musl-includes.patch
a46e3a84b00a39a356618831d0ddfb7f0d10f0a3799d1307ba2cc832e73c01f8d637a4e801a6dd25025f6f13155c6ad8b836422ff72d365e51063ac0bf907f52 cpupower-libs.patch
97ecfeaaaa8efca7af585316b843bf7be885e88095bbdfbf52bc9a96b14dc862435482781e205ea022ab208978aaa4aabb317354fab890ed514a5088ae5045c8 cpupower.initd
63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c cpupower.confd"
diff --git a/community/linux-tools/tmon-musl-includes.patch b/community/linux-tools/tmon-musl-includes.patch
new file mode 100644
index 0000000000..f54948980e
--- /dev/null
+++ b/community/linux-tools/tmon-musl-includes.patch
@@ -0,0 +1,17 @@
+Author: Milan P. Stanić <mps@arvanta.net>
+Date: Tue Mar 32 20:06:31 2021 +0000
+
+add needed includes for musl in tmon.h
+
+--- a/tools/thermal/tmon/tmon.h 2020-12-13 22:41:30.000000000 +0000
++++ b/tools/thermal/tmon/tmon.h 2021-03-03 17:45:43.570040159 +0000
+@@ -10,6 +10,9 @@
+ #ifndef TMON_H
+ #define TMON_H
+
++#include <pthread.h>
++#include <sys/time.h>
++
+ #define MAX_DISP_TEMP 125
+ #define MAX_CTRL_TEMP 105
+ #define MIN_CTRL_TEMP 40