Update from repo

See changes at https://gitlab.com/hexchain/repo/commit/4b9c31a22685ce955757501e13853bab241d8760

3 files changed, 11 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5b8e70e9dc5..b60febd8be2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = dptf
 	pkgdesc = Intel (R) Dynamic Platform and Thermal Framework (Intel (R) DPTF)
-	pkgver = 8.7.10100
-	pkgrel = 3
+	pkgver = 8.7.10101
+	pkgrel = 1
 	url = https://github.com/intel/dptf
 	arch = x86_64
 	license = custom
 	makedepends = cmake
 	depends = readline
-	source = https://github.com/intel/dptf/archive/8.7.10100.tar.gz
-	source = fix-runtime-path.patch
-	sha256sums = fbd9302973fcb3ca32aec9a38891fa25e8ab17720fab3c994955fd1ffca72661
-	sha256sums = c1ba1a2963b5b9a3d901bec3709c79f3130ee83bfd03885be526778403cb8ade
+	source = https://github.com/intel/dptf/archive/8.7.10101.tar.gz
+	sha256sums = 4a92a6cf2d0b97ed2c4ecaa27275c57c3171ba9cf0660e79cd56d80c921e6f1e
 
 pkgname = dptf
 
diff --git a/PKGBUILD b/PKGBUILD
index d0170dc48fac..dd5052ab4cae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,14 @@
 pkgname=dptf
-pkgver=8.7.10100
-pkgrel=3
+pkgver=8.7.10101
+pkgrel=1
 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" "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"
-}
+source=("https://github.com/intel/dptf/archive/$pkgver.tar.gz")
+sha256sums=('4a92a6cf2d0b97ed2c4ecaa27275c57c3171ba9cf0660e79cd56d80c921e6f1e')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
@@ -44,9 +39,9 @@ build() {
 
 package() {
     cd "$srcdir/$pkgname-$pkgver"
-    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 -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 -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
deleted file mode 100644
index d0956da6ce25..000000000000
--- a/fix-runtime-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
- ;
-