upgpkg: corefreq 1.97.1-1

upstream release

4 files changed, 145 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72f7211639f2..cd85c995204c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 pkgbase = corefreq
 	pkgdesc = A CPU monitoring software with BIOS like functionalities
-	pkgver = 1.96.5
+	pkgver = 1.97.1
 	pkgrel = 1
 	url = https://github.com/cyring/CoreFreq
 	arch = x86_64
-	license = GPL2
+	license = GPL-2.0-only
 	depends = dkms
-	source = corefreq-1.96.5.tar.gz::https://github.com/cyring/CoreFreq/archive/1.96.5.tar.gz
+	source = corefreq-1.97.1.tar.gz::https://github.com/cyring/CoreFreq/archive/1.97.1.tar.gz
 	source = dkms.conf
 	source = honor-archlinux-compiler-flags.patch
-	b2sums = c963471b94ce957830ac7928e1bc009c286e1db300f1f3de7da7cc1c5873015734be9e56df7d5fecef67cf28f349907ae4a2296d9f45801535f97f8d239907d3
-	b2sums = c6d8849944f99195038ac252d010d3e3001cd1dcaee57218c4a7f58fa313aa38842e4ea991d4d9ff7d04063ebaa9900c06ff1eacfa6270341cf37fb752adc00c
-	b2sums = 3f5f9a27863412d620864e8c19e2683e3ef2103c4b95c126438330a9b532e2434664ce4860b6191552298131e434c09f5531428696dde7d70a1cb171b4f13edf
+	b2sums = 9bbfd3468a6b8033c34a0c18dacd5d02c18af1b033368e69cfe492de4499b322182ae8fc15074d4f70d58387ac6d14d859e6bd698e29e6ef647336ac46be560b
+	b2sums = a47306b69244b2c7cfe34a5a19aabc7d22ef8982402da038bfb65a357bed9aa0d9f30b034afa7c6dbc23969448142a0027bd14364a14da92b1c666881e15420c
+	b2sums = f4299ed5c44052a521988d417410081ddb92a5f481012f9c7a964ec0dee6a63be6123cef8f8618f23be6827e25aeb3fef93f8c270aaa3076cc1f434a6d4ca861
 
 pkgname = corefreq-client
 	pkgdesc = CoreFreq client
-	depends = corefreq-server=1.96.5
+	depends = corefreq-server=1.97.1
 
 pkgname = corefreq-server
 	pkgdesc = CoreFreq server
-	depends = corefreq-dkms=1.96.5
+	depends = corefreq-dkms=1.97.1
 
 pkgname = corefreq-dkms
 	pkgdesc = CoreFreq - kernel module sources
diff --git a/PKGBUILD b/PKGBUILD
index 4781659ac9c4..86cbcfcb209c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,19 +12,19 @@ _transparency=
 pkgbase=corefreq
 pkgname=(corefreq-client corefreq-server corefreq-dkms)
 _gitname=CoreFreq
-pkgver=1.96.5
+pkgver=1.97.1
 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')
 source=(${pkgbase}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz"
         'dkms.conf'
         'honor-archlinux-compiler-flags.patch')
-b2sums=('c963471b94ce957830ac7928e1bc009c286e1db300f1f3de7da7cc1c5873015734be9e56df7d5fecef67cf28f349907ae4a2296d9f45801535f97f8d239907d3'
-        'c6d8849944f99195038ac252d010d3e3001cd1dcaee57218c4a7f58fa313aa38842e4ea991d4d9ff7d04063ebaa9900c06ff1eacfa6270341cf37fb752adc00c'
-        '3f5f9a27863412d620864e8c19e2683e3ef2103c4b95c126438330a9b532e2434664ce4860b6191552298131e434c09f5531428696dde7d70a1cb171b4f13edf')
+b2sums=('9bbfd3468a6b8033c34a0c18dacd5d02c18af1b033368e69cfe492de4499b322182ae8fc15074d4f70d58387ac6d14d859e6bd698e29e6ef647336ac46be560b'
+        'a47306b69244b2c7cfe34a5a19aabc7d22ef8982402da038bfb65a357bed9aa0d9f30b034afa7c6dbc23969448142a0027bd14364a14da92b1c666881e15420c'
+        'f4299ed5c44052a521988d417410081ddb92a5f481012f9c7a964ec0dee6a63be6123cef8f8618f23be6827e25aeb3fef93f8c270aaa3076cc1f434a6d4ca861')
 
 prepare(){
   cd "${_gitname}-${pkgver}"
@@ -33,11 +33,7 @@ prepare(){
 
 build() {
   cd "${_gitname}-${pkgver}"
-  if [ -n "${_transparency}" ]; then
-    make corefreqd corefreq-cli UI_TRANSPARENCY=1
-  else
-    make corefreqd corefreq-cli
-  fi
+  make prepare corefreqd corefreq-cli -j
 }
 
 package_corefreq-dkms() {
@@ -54,7 +50,8 @@ package_corefreq-dkms() {
       -i "${pkgdir}/usr/src/${pkgbase}-${pkgver}/dkms.conf"
 
   # Copy sources (including Makefile)
-  cp -r "${_gitname}-${pkgver}"/{*.c,*.h,Makefile} "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
+  cp -r "${_gitname}-${pkgver}"/{Makefile,scripter.sh} "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
+  cp -r "${_gitname}-${pkgver}"/${CARCH} "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
 }
 
 package_corefreq-server() {
@@ -62,7 +59,7 @@ package_corefreq-server() {
   depends=("corefreq-dkms=$pkgver")
 
   cd "${_gitname}-${pkgver}"
-  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"
 }
 
@@ -71,5 +68,5 @@ package_corefreq-client() {
   depends=("corefreq-server=$pkgver")
 
   cd "${_gitname}-${pkgver}"
-  install -Dm755 corefreq-cli "${pkgdir}/usr/bin/corefreq-cli"
+  install -Dm755 build/corefreq-cli "${pkgdir}/usr/bin/corefreq-cli"
 }
diff --git a/dkms.conf b/dkms.conf
index 93035bad1ebe..c7fd72f9a2ca 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,7 +1,23 @@
+AUTOINSTALL="yes"
 PACKAGE_NAME="@_PKGBASE@"
 PACKAGE_VERSION="@PKGVER@"
 CLEAN="make -C $source_tree/$PACKAGE_NAME-$PACKAGE_VERSION KERNELDIR=$kernel_source_dir clean"
 MAKE[0]="make -C $source_tree/$PACKAGE_NAME-$PACKAGE_VERSION KERNELDIR=$kernel_source_dir"
 BUILT_MODULE_NAME[0]="@_KERNELMODULE@"
+BUILT_MODULE_LOCATION[0]="build/"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/misc"
-AUTOINSTALL="yes"
+#
+DAEMON="\$source_tree/\$PACKAGE_NAME-\$PACKAGE_VERSION/build/corefreqd"
+CLIENT="\$source_tree/\$PACKAGE_NAME-\$PACKAGE_VERSION/build/corefreq-cli"
+SCRIPT="scripter.sh"
+COMMAND="install -Dm 0755 -s -t /bin"
+OBJECTS="\$source_tree/\$PACKAGE_NAME-\$PACKAGE_VERSION/build/*.o"
+BINARIES="/bin/corefreqd /bin/corefreq-cli"
+CLEANUP="rm -f"
+#
+POST_INSTALL="$SCRIPT $CLEANUP -- $OBJECTS"
+POST_REMOVE="$SCRIPT $CLEANUP -- $BINARIES"
+#
+PRE_BUILD="$SCRIPT make -- prepare"
+#PRE_INSTALL="$SCRIPT $COMMAND -- $DAEMON $CLIENT"
+
diff --git a/honor-archlinux-compiler-flags.patch b/honor-archlinux-compiler-flags.patch
index 2ebfa558adbe..21523dc31d46 100644
--- a/honor-archlinux-compiler-flags.patch
+++ b/honor-archlinux-compiler-flags.patch
@@ -1,62 +1,113 @@
 diff --git a/Makefile b/Makefile
-index 0601f48..0dc3922 100644
+index a21614a..f38386b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -91,48 +91,48 @@ clean:
- 	$(MAKE) -j1 -C $(KERNELDIR) M=$(PWD) clean
- 
- corefreqm.o: corefreqm.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreqm.c \
-+	$(CC)  $(CFLAGS) $(LDFLAGS) -c corefreqm.c \
- 	  $(DEFINITIONS) \
- 	  -o corefreqm.o
- 
- corefreqd.o: corefreqd.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -pthread -c corefreqd.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -pthread -c corefreqd.c \
- 	  $(DEFINITIONS) \
- 	  -o corefreqd.o
- 
- corefreqd: corefreqd.o corefreqm.o
--	$(CC) $(OPTIM_FLG) $(WARNING) corefreqd.c corefreqm.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) corefreqd.c corefreqm.c \
- 	  $(DEFINITIONS) \
- 	  -o 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 \
- 	  $(DEFINITIONS) \
- 	  -o corefreq-ui.o
- 
- corefreq-cli.o: corefreq-cli.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c corefreq-cli.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c corefreq-cli.c \
- 	  $(DEFINITIONS) $(LAYOUT) \
- 	  -o 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 \
- 	  $(DEFINITIONS) $(LAYOUT) \
- 	  -o 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 \
- 	  $(DEFINITIONS) \
- 	  -o 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 \
- 	  $(DEFINITIONS) \
- 	  -o corefreq-cli-extra.o
- 
- corefreq-cli: corefreq-cli.o corefreq-ui.o corefreq-cli-rsc.o \
- 		corefreq-cli-json.o 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 \
- 	  $(DEFINITIONS) $(LAYOUT) \
+@@ -4,7 +4,7 @@
+ 
+ HW = $(shell uname -m)
+ CC ?= cc
+-WARNING = -Wall -Wfatal-errors
++WARNING = -w
+ SYMLINK ?= ln -s
+ INSTALL ?= install
+ DEPMOD ?= depmod
+@@ -39,14 +39,18 @@ ccflags-y +=	-D CORE_COUNT=$(CORE_COUNT) \
+ ccflags-y += $(WARNING)
+ 
+ ifeq ($(OPTIM_LVL),0)
+-OPTIM_FLG = -O$(OPTIM_LVL)
++CFLAGS += -O$(OPTIM_LVL)
++LDFLAGS += -O$(OPTIM_LVL)
+ ccflags-y += -fno-inline
+ else ifneq ($(OPTIM_LVL),)
+-OPTIM_FLG = -O$(OPTIM_LVL)
++CFLAGS += -O$(OPTIM_LVL)
++LDFLAGS += -O$(OPTIM_LVL)
+ ccflags-y += -D OPTIM_LVL=$(OPTIM_LVL)
+-ccflags-y += $(OPTIM_FLG)
++ccflags-y += -O$(OPTIM_LVL)
+ endif
+ 
++CFLAGS +=  $(WARNING)
++
+ DEFINITIONS =	-D CORE_COUNT=$(CORE_COUNT) -D TASK_ORDER=$(TASK_ORDER) \
+ 		-D MAX_FREQ_HZ=$(MAX_FREQ_HZ) -D UBENCH=$(UBENCH)
+ 
+@@ -193,49 +197,48 @@ clean:
+ 	fi
+ 
+ $(BUILD)/corefreqm.o: $(HW)/corefreqm.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -pthread $(DEFINITIONS) \
+-	  -c $(HW)/corefreqm.c -o $(BUILD)/corefreqm.o
++	$(CC) -c $(HW)/corefreqm.c -o $(BUILD)/corefreqm.o \
++	  $(CFLAGS) $(DEFINITIONS)
+ 
+ $(BUILD)/corefreqd.o: $(HW)/corefreqd.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) -pthread $(DEFINITIONS) \
+-	  -c $(HW)/corefreqd.c -o $(BUILD)/corefreqd.o
++	$(CC) -c $(HW)/corefreqd.c -o $(BUILD)/corefreqd.o \
++	  $(CFLAGS) $(DEFINITIONS) -pthread
+ 
+ $(BUILD)/corefreqd: $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o
+-	$(CC) $(OPTIM_FLG) -o $(BUILD)/corefreqd \
+-	  $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o -lpthread -lm -lrt -lc
++	$(CC) $(LDFLAGS) -o $(BUILD)/corefreqd \
++	  $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o -lpthread -lm -lrt
+ 
+ .PHONY: corefreqd
+ corefreqd: $(BUILD)/corefreqd
+ 
+ $(BUILD)/corefreq-ui.o: $(HW)/corefreq-ui.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) \
+-	  -c $(HW)/corefreq-ui.c -o $(BUILD)/corefreq-ui.o
++	$(CC) -c $(HW)/corefreq-ui.c -o $(BUILD)/corefreq-ui.o \
++	  $(CFLAGS) $(DEFINITIONS)
+ 
+ $(BUILD)/corefreq-cli.o: $(HW)/corefreq-cli.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) $(LAYOUT) \
+-	  -c $(HW)/corefreq-cli.c -o $(BUILD)/corefreq-cli.o
++	$(CC) -c $(HW)/corefreq-cli.c -o $(BUILD)/corefreq-cli.o \
++	  $(CFLAGS) $(DEFINITIONS) $(LAYOUT)
+ 
+ $(BUILD)/corefreq-cli-rsc.o: $(HW)/corefreq-cli-rsc.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) $(LAYOUT) \
+-	  -c $(HW)/corefreq-cli-rsc.c -o $(BUILD)/corefreq-cli-rsc.o
++	$(CC) -c $(HW)/corefreq-cli-rsc.c -o $(BUILD)/corefreq-cli-rsc.o \
++	  $(CFLAGS) $(DEFINITIONS) $(LAYOUT)
+ 
+ $(BUILD)/corefreq-cli-json.o: $(HW)/corefreq-cli-json.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) \
+-	  -c $(HW)/corefreq-cli-json.c -o $(BUILD)/corefreq-cli-json.o
++	$(CC) -c $(HW)/corefreq-cli-json.c -o $(BUILD)/corefreq-cli-json.o \
++	  $(CFLAGS) $(DEFINITIONS)
+ 
+ $(BUILD)/corefreq-cli-extra.o: $(HW)/corefreq-cli-extra.c
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) \
+-	  -c $(HW)/corefreq-cli-extra.c -o $(BUILD)/corefreq-cli-extra.o
++	$(CC) -c $(HW)/corefreq-cli-extra.c -o $(BUILD)/corefreq-cli-extra.o \
++	  $(CFLAGS) $(DEFINITIONS)
+ 
+ $(BUILD)/corefreq-cli:	$(BUILD)/corefreq-cli.o \
+ 			$(BUILD)/corefreq-ui.o \
+ 			$(BUILD)/corefreq-cli-rsc.o \
+ 			$(BUILD)/corefreq-cli-json.o \
+ 			$(BUILD)/corefreq-cli-extra.o
+-	$(CC) $(OPTIM_FLG) -o $(BUILD)/corefreq-cli \
+-	  $(BUILD)/corefreq-cli.o $(BUILD)/corefreq-ui.o \
+-	  $(BUILD)/corefreq-cli-rsc.o $(BUILD)/corefreq-cli-json.o \
+-	  $(BUILD)/corefreq-cli-extra.o -lm -lrt -lc
++	$(CC) $(LDFLAGS) -o $(BUILD)/corefreq-cli \
++	  $(BUILD)/corefreq-cli.o $(BUILD)/corefreq-ui.o $(BUILD)/corefreq-cli-rsc.o \
++	  $(BUILD)/corefreq-cli-json.o $(BUILD)/corefreq-cli-extra.o -lm -lrt -lc
+ 
+ .PHONY: corefreq-cli
+ corefreq-cli: $(BUILD)/corefreq-cli
+@@ -244,6 +247,8 @@ corefreq-cli: $(BUILD)/corefreq-cli
+ info:
+ 	$(info HW [$(HW)])
+ 	$(info CC [$(shell whereis -b $(CC))])
++	$(info CFLAGS [$(CFLAGS)])
++	$(info LDFLAGS [$(LDFLAGS)])
+ 	$(info WARNING [$(WARNING)])
+ 	$(info PWD [$(PWD)])
+ 	$(info BUILD [$(BUILD)])