From 35877eb7b6bfb00137de0dfa427177bb114e15d0 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Tue, 6 Aug 2019 08:02:41 -0300
Subject: testing/thermald: fix license, use supervise-daemon

---
 testing/thermald/APKBUILD       | 28 +++++++++++++---------------
 testing/thermald/thermald.initd | 10 +++++++---
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'testing/thermald')

diff --git a/testing/thermald/APKBUILD b/testing/thermald/APKBUILD
index de608cab0e..5e20b93c54 100644
--- a/testing/thermald/APKBUILD
+++ b/testing/thermald/APKBUILD
@@ -3,44 +3,42 @@
 pkgname=thermald
 _pkgname=thermal_daemon
 pkgver=1.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Thermal daemon for IA"
 url="https://github.com/01org/thermal_daemon"
 arch="all !armhf !armv7 !aarch64 !s390x"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-or-later"
 makedepends="autoconf automake libtool dbus-glib-dev libxml2-dev linux-headers"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/01org/$_pkgname/archive/v$pkgver.tar.gz
 	thermald.initd
 	ppc64le.patch"
 builddir="$srcdir/$_pkgname-$pkgver"
 
-build() {
-	cd "$builddir"
-
+prepare() {
+	default_prepare
 	./autogen.sh
+}
+
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
-	cd "$builddir"
-
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/etc/init/ "$pkgdir"/etc/dbus-1
 
 	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+		"$pkgdir"/etc/init.d/$pkgname
 }
 
 sha512sums="ddcd01dcd2f6b5666ffa16ba635734e4c146244b5df7c3f0deb8120f8ee7ebf1f4ee302d49db2b7e9a4950045650922977bd40bf6b38ccea9896f81e06df1d49  thermald-1.6.tar.gz
-c4872ff38e8001b753b12759bcd11364581b12ff710fa1eac21d769fd62cb4ba1a01bd0ba4adec7a72b71be094a425b803239a56296e8c111426e08eb9917c70  thermald.initd
+ea8964b15fdebc2fb59e93c15b813b93691c2ba01689ac6080f1308a3063b23cba56b4539ccae87575689036f74300a1c22c9b0e77d4ecef9bc08198d7fe4892  thermald.initd
 517d2c26dc5464c59e9c0cbea2bb1bcbe78cad87a26965cec8ec6d48a4b1bbb25c73bc5e772bbf0754e56222c8497d534b974b3a94c104bc4213be740aea9a5d  ppc64le.patch"
diff --git a/testing/thermald/thermald.initd b/testing/thermald/thermald.initd
index ee5eaeb5e1..15c1bfc0b3 100644
--- a/testing/thermald/thermald.initd
+++ b/testing/thermald/thermald.initd
@@ -1,9 +1,13 @@
 #!/sbin/openrc-run
 
+supervisor=supervise-daemon
+
+name="Thermal Monitor"
+description="Read temperature sensors and decide best action based on data and user preferences"
+
 command=/usr/sbin/thermald
-command_background="yes"
-pidfile="/run/$RC_SVCNAME.pid"
-command_args="--no-daemon --dbus-enable"
+command_args="--dbus-enable"
+command_args_foreground="--no-daemon"
 
 depend() {
 	use clock logger
-- 
cgit v1.2.3