Fix package: build CoreFreq with DKMS.

4 files changed, 55 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 090d7f66eaf3..66412a160f7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 # Generated by mksrcinfo v8
-# Tue Oct 30 13:58:44 UTC 2018
-pkgbase = corefreq-git
+# Tue Nov  6 13:34:10 UTC 2018
+pkgbase = corefreq
 	pkgdesc = CoreFreq, a processor monitoring software with a kernel module inside.
-	pkgver = 1.37.0
-	pkgrel = 1
-	url = http://github.com/cyring/CoreFreq
-	install = corefreq-git.install
+	pkgver = 1.37
+	pkgrel = 0.1
+	url = https://github.com/cyring/CoreFreq
+	install = corefreq.install
 	arch = x86_64
 	license = GPL2
 	makedepends = git
@@ -14,5 +14,5 @@ pkgbase = corefreq-git
 	source = git+https://github.com/cyring/CoreFreq.git
 	md5sums = SKIP
 
-pkgname = corefreq-git
+pkgname = corefreq
 
diff --git a/PKGBUILD b/PKGBUILD
index c0ecd7e12d9e..d79b81babc0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,25 @@
 # Maintainer: CyrIng <labs[at]cyring[dot]fr>
 # Contributor: CyrIng <labs[at]cyring[dot]fr>
-pkgname=corefreq-git
-pkgver=1.37.0
-pkgrel=1
+_gitname=CoreFreq
+pkgname=corefreq
+pkgver=1.37
+pkgrel=0.1
 pkgdesc="CoreFreq, a processor monitoring software with a kernel module inside."
 arch=('x86_64')
-url='http://github.com/cyring/CoreFreq'
+url='https://github.com/cyring/CoreFreq'
 license=('GPL2')
 depends=('dkms')
 makedepends=('git' 'sed')
-source=('git+https://github.com/cyring/CoreFreq.git')
+source=(git+${url}.git)
 md5sums=('SKIP')
 install=${pkgname}.install
 
-_gitname=CoreFreq
-
-build() {
-	cd ${srcdir}/${_gitname}
-	make -w -j1
-}
-
 package() {
-	
-	install -dm755 "${pkgdir}/usr/src"
 	cd ${srcdir}/${_gitname}
-	install -Dm755 corefreqd "${pkgdir}/usr/bin/corefreqd"
-	install -Dm644 corefreqd.service "${pkgdir}/usr/lib/systemd/system/corefreqd.service"
-	install -m755 corefreq-cli "${pkgdir}/usr/bin/corefreq-cli"
-	mkdir "${pkgdir}/usr/src/${pkgname}-${pkgver}/"
-	install -Dm644 dkms.conf "${pkgdir}/usr/src/${pkgname}-${pkgver}/dkms.conf"
-	cp --no-preserve=ownership Makefile *.h *.c dkms.conf \
-		"${pkgdir}/usr/src/${pkgname}-${pkgver}/"
+	make DESTDIR=${pkgdir} dkms_install service_install
 }
 
 pkgver() {
-    cd "${srcdir}/${_gitname}"
-    echo "$(sed -nE 's/#define\s+COREFREQ_VERSION\s+"([0-9\.]+)"/\1/p' coretypes.h).r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+   cd "${srcdir}/${_gitname}"
+   echo "$(sed -nE 's/#define\s+COREFREQ_VERSION\s+"([0-9\.]+)"/\1/p' coretypes.h).r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
diff --git a/corefreq-git.install b/corefreq-git.install
deleted file mode 100644
index 362ed5a38777..000000000000
--- a/corefreq-git.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-	dkms install corefreq-git/${1%%-*}
-	echo -e 'modprobe or insmod the kernel module corefreqk.ko\nbefore starting the daemon corefreqd\nthen run the client corefreq-cli'
-}
-
-pre_upgrade() {
-	pre_remove ${2%%-*}
-}
-
-post_upgrade() {
-	post_install ${1%%-*}
-}
-
-pre_remove() {
-	dkms remove corefreq-git/${1%%-*} --all
-}
diff --git a/corefreq.install b/corefreq.install
new file mode 100644
index 000000000000..5a7f4669f536
--- /dev/null
+++ b/corefreq.install
@@ -0,0 +1,39 @@
+MODULE="corefreqk"
+
+post_install() {
+	A_B_C_D=${1}
+	DRV_VERSION=${A_B_C_D%-*}
+	dkms add -q -m ${MODULE} -v ${DRV_VERSION}
+	dkms build -q ${MODULE}/${DRV_VERSION}
+	dkms install -q ${MODULE}/${DRV_VERSION}
+
+	echo -e '--[ CoreFreq Starting Instructions ]--\n'\
+		' 1: load the kernel module\n'\
+		'  > modprobe corefreqk\n'\
+		' 2: enable and start the daemon\n'\
+		'  > systemctl enable corefreqd\n'\
+		'  > systemctl start corefreqd\n'\
+		' 3: run the client\n'\
+		'  > corefreq-cli'
+}
+
+pre_upgrade() {
+	pre_remove ${2%%-*}
+}
+
+post_upgrade() {
+	post_install ${1%%-*}
+}
+
+pre_remove() {
+	if [ "$(dkms status -m ${MODULE})" ]; then
+		modprobe -r ${MODULE} 2>/dev/null
+		if [ $? -eq 0 ]; then
+			echo "Module [${MODULE}] unloaded.\n"
+		fi
+
+		A_B_C_D=${1}
+		DRV_VERSION=${A_B_C_D%-*}
+		dkms remove -q ${MODULE}/${DRV_VERSION} --all
+	fi
+}