upgpkg: corefreq-git 1.97.0.r0.g93db569-1

upstream release

3 files changed, 56 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9019e47af505..6bc69a9595ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = corefreq-git
 	pkgdesc = A CPU monitoring software with BIOS like functionalities
-	pkgver = 1.95.5.r0.g34efe5d
+	pkgver = 1.97.0.r0.g93db569
 	pkgrel = 1
 	url = https://github.com/cyring/CoreFreq
 	arch = x86_64
-	license = GPL2
+	license = GPL-2.0-only
 	makedepends = git
 	depends = dkms
 	source = git+https://github.com/cyring/CoreFreq.git#branch=master
@@ -12,7 +12,7 @@ pkgbase = corefreq-git
 	source = honor-archlinux-compiler-flags.patch
 	b2sums = SKIP
 	b2sums = c6d8849944f99195038ac252d010d3e3001cd1dcaee57218c4a7f58fa313aa38842e4ea991d4d9ff7d04063ebaa9900c06ff1eacfa6270341cf37fb752adc00c
-	b2sums = 3f5f9a27863412d620864e8c19e2683e3ef2103c4b95c126438330a9b532e2434664ce4860b6191552298131e434c09f5531428696dde7d70a1cb171b4f13edf
+	b2sums = 0b409cbc017b5b8d30cf2f291fe288172a8f8a1d773f17e5c860f2a9a929e758731993a2e56a4d0f03364b40481577765a714d8daf7261f2832c02921b347c93
 
 pkgname = corefreq-client-git
 	pkgdesc = CoreFreq client
diff --git a/PKGBUILD b/PKGBUILD
index 3d190a22ef10..a8ee7df86e43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,12 +13,12 @@ pkgbase=corefreq-git
 pkgname=(corefreq-client-git corefreq-server-git corefreq-dkms-git)
 _gitname=CoreFreq
 _pkgbase=${pkgbase%-*}
-pkgver=1.95.5.r0.g34efe5d
+pkgver=1.97.0.r0.g93db569
 pkgrel=1
 pkgdesc="A CPU monitoring software with BIOS like functionalities"
 arch=('x86_64')
 url='https://github.com/cyring/CoreFreq'
-license=('GPL2')
+license=('GPL-2.0-only')
 depends=('dkms')
 makedepends=('git')
 source=(git+"${url}.git#branch=master"
@@ -26,7 +26,7 @@ source=(git+"${url}.git#branch=master"
         'honor-archlinux-compiler-flags.patch')
 b2sums=('SKIP'
         'c6d8849944f99195038ac252d010d3e3001cd1dcaee57218c4a7f58fa313aa38842e4ea991d4d9ff7d04063ebaa9900c06ff1eacfa6270341cf37fb752adc00c'
-        '3f5f9a27863412d620864e8c19e2683e3ef2103c4b95c126438330a9b532e2434664ce4860b6191552298131e434c09f5531428696dde7d70a1cb171b4f13edf')
+        '0b409cbc017b5b8d30cf2f291fe288172a8f8a1d773f17e5c860f2a9a929e758731993a2e56a4d0f03364b40481577765a714d8daf7261f2832c02921b347c93')
 
 pkgver() {
   cd "${_gitname}"
@@ -41,9 +41,9 @@ prepare(){
 build() {
   cd "${_gitname}"
   if [ -n "${_transparency}" ]; then
-    make corefreqd corefreq-cli UI_TRANSPARENCY=1
+    make prepare corefreqd corefreq-cli -j UI_TRANSPARENCY=1
   else
-    make corefreqd corefreq-cli
+    make prepare corefreqd corefreq-cli -j
   fi
 }
 
@@ -63,7 +63,8 @@ package_corefreq-dkms-git() {
       -i "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
 
   # Copy sources (including Makefile)
-  cp -r "${_gitname}"/{*.c,*.h,Makefile} "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/"
+  cp -r "${_gitname}"/Makefile "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/"
+  cp -r "${_gitname}"/${CARCH}/{*.c,*.h} "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/"
 }
 
 package_corefreq-server-git() {
@@ -73,7 +74,7 @@ package_corefreq-server-git() {
   conflicts=('corefreq-server')
 
   cd "${_gitname}"
-  install -Dm755 corefreqd "${pkgdir}/usr/bin/corefreqd"
+  install -Dm755 build/corefreqd "${pkgdir}/usr/bin/corefreqd"
   install -Dm 0644 corefreqd.service "${pkgdir}/usr/lib/systemd/system/corefreqd.service"
 }
 
@@ -84,5 +85,5 @@ package_corefreq-client-git() {
   conflicts=('corefreq-client')
 
   cd "${_gitname}"
-  install -Dm755 corefreq-cli "${pkgdir}/usr/bin/corefreq-cli"
+  install -Dm755 build/corefreq-cli "${pkgdir}/usr/bin/corefreq-cli"
 }
diff --git a/honor-archlinux-compiler-flags.patch b/honor-archlinux-compiler-flags.patch
index 2ebfa558adbe..b958af806b06 100644
--- a/honor-archlinux-compiler-flags.patch
+++ b/honor-archlinux-compiler-flags.patch
@@ -1,62 +1,67 @@
 diff --git a/Makefile b/Makefile
-index 0601f48..0dc3922 100644
+index 8cdc9ed..b37f051 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -91,48 +91,48 @@ clean:
- 	$(MAKE) -j1 -C $(KERNELDIR) M=$(PWD) clean
+@@ -193,17 +193,17 @@ clean:
+ 	fi
  
- corefreqm.o: corefreqm.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreqm.c \
-+	$(CC)  $(CFLAGS) $(LDFLAGS) -c corefreqm.c \
+ $(BUILD)/corefreqm.o: $(HW)/corefreqm.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreqm.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreqm.c \
  	  $(DEFINITIONS) \
- 	  -o corefreqm.o
+ 	  -o $(BUILD)/corefreqm.o
  
- corefreqd.o: corefreqd.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -pthread -c corefreqd.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -pthread -c corefreqd.c \
+ $(BUILD)/corefreqd.o: $(HW)/corefreqd.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -pthread -c $(HW)/corefreqd.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) -pthread -c $(HW)/corefreqd.c \
  	  $(DEFINITIONS) \
- 	  -o corefreqd.o
+ 	  -o $(BUILD)/corefreqd.o
  
- corefreqd: corefreqd.o corefreqm.o
--	$(CC) $(OPTIM_FLG) $(WARNING) corefreqd.c corefreqm.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) corefreqd.c corefreqm.c \
+ $(BUILD)/corefreqd: $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(HW)/corefreqd.c $(HW)/corefreqm.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(HW)/corefreqd.c $(HW)/corefreqm.c \
  	  $(DEFINITIONS) \
- 	  -o corefreqd -lpthread -lm -lrt
+ 	  -o $(BUILD)/corefreqd -lpthread -lm -lrt
  
- corefreq-ui.o: corefreq-ui.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreq-ui.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c corefreq-ui.c \
+@@ -211,27 +211,27 @@ $(BUILD)/corefreqd: $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o
+ corefreqd: $(BUILD)/corefreqd
+ 
+ $(BUILD)/corefreq-ui.o: $(HW)/corefreq-ui.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-ui.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-ui.c \
  	  $(DEFINITIONS) \
- 	  -o corefreq-ui.o
+ 	  -o $(BUILD)/corefreq-ui.o
  
- corefreq-cli.o: corefreq-cli.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreq-cli.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c corefreq-cli.c \
+ $(BUILD)/corefreq-cli.o: $(HW)/corefreq-cli.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli.c \
  	  $(DEFINITIONS) $(LAYOUT) \
- 	  -o corefreq-cli.o
+ 	  -o $(BUILD)/corefreq-cli.o
  
- corefreq-cli-rsc.o: corefreq-cli-rsc.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreq-cli-rsc.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c corefreq-cli-rsc.c \
+ $(BUILD)/corefreq-cli-rsc.o: $(HW)/corefreq-cli-rsc.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli-rsc.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli-rsc.c \
  	  $(DEFINITIONS) $(LAYOUT) \
- 	  -o corefreq-cli-rsc.o
+ 	  -o $(BUILD)/corefreq-cli-rsc.o
  
- corefreq-cli-json.o: corefreq-cli-json.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreq-cli-json.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c corefreq-cli-json.c \
+ $(BUILD)/corefreq-cli-json.o: $(HW)/corefreq-cli-json.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli-json.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli-json.c \
  	  $(DEFINITIONS) \
- 	  -o corefreq-cli-json.o
+ 	  -o $(BUILD)/corefreq-cli-json.o
  
- corefreq-cli-extra.o: corefreq-cli-extra.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreq-cli-extra.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c corefreq-cli-extra.c \
+ $(BUILD)/corefreq-cli-extra.o: $(HW)/corefreq-cli-extra.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli-extra.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli-extra.c \
  	  $(DEFINITIONS) \
- 	  -o corefreq-cli-extra.o
+ 	  -o $(BUILD)/corefreq-cli-extra.o
  
- corefreq-cli: corefreq-cli.o corefreq-ui.o corefreq-cli-rsc.o \
- 		corefreq-cli-json.o corefreq-cli-extra.o
+@@ -240,7 +240,7 @@ $(BUILD)/corefreq-cli:	$(BUILD)/corefreq-cli.o \
+ 			$(BUILD)/corefreq-cli-rsc.o \
+ 			$(BUILD)/corefreq-cli-json.o \
+ 			$(BUILD)/corefreq-cli-extra.o
 -	$(CC) $(OPTIM_FLG) $(WARNING) \
 +	$(CC) $(CFLAGS) $(LDFLAGS) \
- 	  corefreq-cli.c corefreq-ui.c corefreq-cli-rsc.c \
- 	  corefreq-cli-json.c corefreq-cli-extra.c \
+ 	  $(HW)/corefreq-cli.c $(HW)/corefreq-ui.c $(HW)/corefreq-cli-rsc.c \
+ 	  $(HW)/corefreq-cli-json.c $(HW)/corefreq-cli-extra.c \
  	  $(DEFINITIONS) $(LAYOUT) \