fix-runtime-path.path

3 files changed, 46 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 55176733e966..a5b8e70e9dc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = dptf
 	pkgdesc = Intel (R) Dynamic Platform and Thermal Framework (Intel (R) DPTF)
 	pkgver = 8.7.10100
-	pkgrel = 1
+	pkgrel = 3
 	url = https://github.com/intel/dptf
 	arch = x86_64
 	license = custom
 	makedepends = cmake
-	makedepends = ninja
 	depends = readline
 	source = https://github.com/intel/dptf/archive/8.7.10100.tar.gz
+	source = fix-runtime-path.patch
 	sha256sums = fbd9302973fcb3ca32aec9a38891fa25e8ab17720fab3c994955fd1ffca72661
+	sha256sums = c1ba1a2963b5b9a3d901bec3709c79f3130ee83bfd03885be526778403cb8ade
 
 pkgname = dptf
 
diff --git a/PKGBUILD b/PKGBUILD
index 344252fc46da..d0170dc48fac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,19 @@
 pkgname=dptf
 pkgver=8.7.10100
-pkgrel=1
+pkgrel=3
 pkgdesc='Intel (R) Dynamic Platform and Thermal Framework (Intel (R) DPTF)'
 arch=('x86_64')
 url='https://github.com/intel/dptf'
 license=('custom')
 depends=('readline')
 makedepends=('cmake')
-source=("https://github.com/intel/dptf/archive/$pkgver.tar.gz")
-sha256sums=('fbd9302973fcb3ca32aec9a38891fa25e8ab17720fab3c994955fd1ffca72661')
+source=("https://github.com/intel/dptf/archive/$pkgver.tar.gz" "fix-runtime-path.patch")
+sha256sums=('fbd9302973fcb3ca32aec9a38891fa25e8ab17720fab3c994955fd1ffca72661'
+            'c1ba1a2963b5b9a3d901bec3709c79f3130ee83bfd03885be526778403cb8ade')
+
+prepare() {
+    patch "$srcdir/$pkgname-$pkgver/ESIF/Products/ESIF_UF/Sources/lin/main.c" "$srcdir/fix-runtime-path.patch"
+}
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
@@ -39,9 +44,9 @@ build() {
 
 package() {
     cd "$srcdir/$pkgname-$pkgver"
-    install -Dm755 DPTF/Linux/build/x64/release/Dptf{,Policy{Active,Critical,Passive}}.so -t "$pkgdir/usr/share/dptf/ufx64/"
-    install -Dm755 ESIF/Products/ESIF_CMP/Linux/esif_cmp.so "$pkgdir/usr/share/dptf/ufx64/esif_cmp.so"
-    install -Dm755 ESIF/Products/ESIF_WS/Linux/esif_ws.so "$pkgdir/usr/share/dptf/ufx64/esif_ws.so"
+    install -Dm755 DPTF/Linux/build/x64/release/Dptf{,Policy{Active,Critical,Passive}}.so -t "$pkgdir/usr/lib/dptf/ufx64/"
+    install -Dm755 ESIF/Products/ESIF_CMP/Linux/esif_cmp.so "$pkgdir/usr/lib/dptf/ufx64/esif_cmp.so"
+    install -Dm755 ESIF/Products/ESIF_WS/Linux/esif_ws.so "$pkgdir/usr/lib/dptf/ufx64/esif_ws.so"
     install -Dm644 ESIF/Packages/DSP/dsp.dv "$pkgdir/etc/dptf/dsp.dv"
     install -Dm755 ESIF/Products/ESIF_UF/Linux/esif_ufd "$pkgdir/usr/bin/esif_ufd"
     install -Dm644 ESIF/Packages/Installers/linux/dptf.service "$pkgdir/usr/lib/systemd/system/dptf.service"
diff --git a/fix-runtime-path.patch b/fix-runtime-path.patch
new file mode 100644
index 000000000000..d0956da6ce25
--- /dev/null
+++ b/fix-runtime-path.patch
@@ -0,0 +1,32 @@
+--- main.c.old	2020-02-24 08:41:01.852761235 +0800
++++ main.c	2020-02-24 08:38:20.674748333 +0800
+@@ -156,19 +156,19 @@
+ 	"UI=/usr/share/dptf/ui\n"
+ #else
+ 	// Generic Linux
+-	"HOME=/usr/share/dptf\n"
++	"HOME=/var/lib/dptf\n"
+ 	"TEMP=/tmp\n"
+ 	"DV=/etc/dptf\n"
+-	"LOG=/usr/share/dptf/log\n"
+-	"BIN=/usr/share/dptf/bin\n"
++	"LOG=/var/lib/dptf/log\n"
++	"BIN=/var/lib/dptf/bin\n"
+ 	"LOCK=/var/run\n"
+-	"EXE=/usr/share/dptf/uf" ARCHNAME "\n"
+-	"DLL=/usr/share/dptf/uf" ARCHNAME "\n"
+-	"DLLALT=/usr/share/dptf/uf" ARCHNAME "\n"
+-	"DPTF=/usr/share/dptf/uf" ARCHNAME "\n"
+-	"DSP=/usr/share/dptf/dsp\n"
+-	"CMD=/usr/share/dptf/cmd\n"
+-	"UI=/usr/share/dptf/ui\n"
++	"EXE=/usr/lib/dptf/uf" ARCHNAME "\n"
++	"DLL=/usr/lib/dptf/uf" ARCHNAME "\n"
++	"DLLALT=/usr/lib/dptf/uf" ARCHNAME "\n"
++	"DPTF=/usr/lib/dptf/uf" ARCHNAME "\n"
++	"DSP=/var/lib/dptf/dsp\n"
++	"CMD=/var/lib/dptf/cmd\n"
++	"UI=/var/lib/dptf/ui\n"
+ #endif
+ ;
+