fix

4 files changed, 40 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d8733bd57b1..1d351e5d8667 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,14 @@
 pkgbase = dptf
 	pkgdesc = Intel (R) Dynamic Platform and Thermal Framework (Intel (R) DPTF)
 	pkgver = 8.4.10401
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/intel/dptf
 	arch = x86_64
 	license = custom
 	makedepends = cmake
 	depends = readline
 	source = https://github.com/intel/dptf/archive/8.4.10401.tar.gz
-	source = DPTF.patch
-	source = ESIF_UF.patch
 	md5sums = 707632f2943e838f379d20a5076fb722
-	md5sums = 21d5ace7fd8bc7d16baa77695904a9d0
-	md5sums = 8d9cf347bc11bca7d0380ff35a5f5ebc
 
 pkgname = dptf
 
diff --git a/DPTF.patch b/DPTF.patch
deleted file mode 100644
index ccfc606f4339..000000000000
--- a/DPTF.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt	2018-05-22 01:09:03.000000000 +0800
-+++ CMakeLists.patched.txt	2019-06-23 09:06:02.664917447 +0800
-@@ -5,7 +5,7 @@
- message ("CXX Flags (initial) : " ${CMAKE_CXX_FLAGS}) 
- 
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -Wno-unused-value -fPIC -Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-unused-value -fPIC -Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2")
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0") 
- 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")
- else()
diff --git a/ESIF_UF.patch b/ESIF_UF.patch
deleted file mode 100644
index b7418480433e..000000000000
--- a/ESIF_UF.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile	2018-05-22 01:09:03.000000000 +0800
-+++ Makefile.patched	2019-06-23 09:15:17.260343325 +0800
-@@ -43,7 +43,6 @@
- CPPFLAGS += -DESIF_FEAT_OPT_COMPRESS
- 
- CFLAGS  += -Wno-multichar
--CFLAGS  += -Werror
- 
- # Compile Flags added for security purposes
- CFLAGS  += -fPIE
diff --git a/PKGBUILD b/PKGBUILD
index 2b6e09bbf51b..d872f502fe94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,53 @@
 # Maintainer: Nick Cao <nickcao@nichi.co>
 pkgname=dptf
 pkgver=8.4.10401
-pkgrel=4
+pkgrel=5
 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/8.4.10401.tar.gz'
-	'DPTF.patch'
-	'ESIF_UF.patch'
-	)
-md5sums=('707632f2943e838f379d20a5076fb722'
-         '21d5ace7fd8bc7d16baa77695904a9d0'
-         '8d9cf347bc11bca7d0380ff35a5f5ebc')
-prepare(){
-	mv "$srcdir/dptf-8.4.10401" "$srcdir/dptf"
-	patch "$srcdir/dptf/DPTF/Linux/CMakeLists.txt" "$srcdir/DPTF.patch"
-	patch "$srcdir/dptf/ESIF/Products/ESIF_UF/Linux/Makefile" "$srcdir/ESIF_UF.patch"
-}
+source=('https://github.com/intel/dptf/archive/8.4.10401.tar.gz')
+md5sums=('707632f2943e838f379d20a5076fb722')
 
 build() {
-	cd "$srcdir/dptf/DPTF/Linux/build"
-	cmake ..
-	make
-	cd "$srcdir/dptf/ESIF/Products/ESIF_UF/Linux"
-	make
-	cd "$srcdir/dptf/ESIF/Products/ESIF_CMP/Linux"
-	make
-	cd "$srcdir/dptf/ESIF/Products/ESIF_WS/Linux"
-	make
+    cd "$srcdir/$pkgname-$pkgver"
+
+    export CXXFLAGS="${CXXFLAGS} -Wno-error=catch-value -Wno-error=stringop-truncation"
+    export CFLAGS="${CFLAGS} -Wno-error=format-truncation"
+
+    pushd DPTF/Linux/build
+    cmake ..
+    make
+    popd
+
+    pushd ESIF/Products/ESIF_UF/Linux
+    make
+    popd
+
+    pushd ESIF/Products/ESIF_CMP/Linux
+    make
+    popd
+
+    pushd ESIF/Products/ESIF_WS/Linux
+    make
+    popd
+
+    cd ESIF/Packages/Installers/linux
+    sed -i 's/^description/Description/' dptf.service
 }
+
 package() {
-	install -Dm644 "$srcdir/dptf/DPTF/Linux/build/x64/release/Dptf.so" "$pkgdir/usr/share/dptf/ufx64/Dptf.so"
-	install -Dm644 "$srcdir/dptf/DPTF/Linux/build/x64/release/DptfPolicyActive.so" "$pkgdir/usr/share/dptf/ufx64/DptfPolicyActive.so"
-	install -Dm644 "$srcdir/dptf/DPTF/Linux/build/x64/release/DptfPolicyCritical.so" "$pkgdir/usr/share/dptf/ufx64/DptfPolicyCritical.so"
-	install -Dm644 "$srcdir/dptf/DPTF/Linux/build/x64/release/DptfPolicyPassive.so" "$pkgdir/usr/share/dptf/ufx64/DptfPolicyPassive.so"
-	install -Dm644 "$srcdir/dptf/ESIF/Products/ESIF_CMP/Linux/esif_cmp.so" "$pkgdir/usr/share/dptf/ufx64/esif_cmp.so"
-	install -Dm644 "$srcdir/dptf/ESIF/Products/ESIF_WS/Linux/esif_ws.so" "$pkgdir/usr/share/dptf/ufx64/esif_ws.so"
-	install -Dm644 "$srcdir/dptf/ESIF/Packages/DSP/dsp.dv" "$pkgdir/etc/dptf/dsp.dv"
-	install -Dm744 "$srcdir/dptf/ESIF/Products/ESIF_UF/Linux/esif_ufd" "$pkgdir/usr/bin/esif_ufd"
-	install -Dm644 "$srcdir/dptf/ESIF/Packages/Installers/linux/dptf.service" "$pkgdir/usr/lib/systemd/system/dptf.service"
-	install -Dm644 "$srcdir/dptf/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    cd "$srcdir/$pkgname-$pkgver"
+    install -Dm755 "DPTF/Linux/build/x64/release/Dptf.so" "$pkgdir/usr/share/dptf/ufx64/Dptf.so"
+    install -Dm755 "DPTF/Linux/build/x64/release/DptfPolicyActive.so" "$pkgdir/usr/share/dptf/ufx64/DptfPolicyActive.so"
+    install -Dm755 "DPTF/Linux/build/x64/release/DptfPolicyCritical.so" "$pkgdir/usr/share/dptf/ufx64/DptfPolicyCritical.so"
+    install -Dm755 "DPTF/Linux/build/x64/release/DptfPolicyPassive.so" "$pkgdir/usr/share/dptf/ufx64/DptfPolicyPassive.so"
+    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"
+    install -Dm644 "LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }