Split package to client server kernel module package

4 files changed, 89 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7754e2b9c24..5e10ef1b95dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,30 @@
 pkgbase = corefreq-git
-	pkgdesc = CoreFreq, Processor monitoring software with BIOS like functionalities
-	pkgver = 1.84
+	pkgver = 1.84.r13.gb9c84b0
 	pkgrel = 1
 	url = https://github.com/cyring/CoreFreq
-	install = corefreq.install
 	arch = x86_64
 	license = GPL2
-	makedepends = git
 	depends = dkms
-	source = git+https://github.com/cyring/CoreFreq.git
-	md5sums = SKIP
+	source = git+https://github.com/cyring/CoreFreq.git#branch=develop
+	source = dkms.conf
+	b2sums = SKIP
+	b2sums = c6d8849944f99195038ac252d010d3e3001cd1dcaee57218c4a7f58fa313aa38842e4ea991d4d9ff7d04063ebaa9900c06ff1eacfa6270341cf37fb752adc00c
 
-pkgname = corefreq-git
+pkgname = corefreq-client-git
+	pkgdesc = CoreFreq client
+	depends = corefreq-server
+	provides = corefreq-client
+	conflicts = corefreq-client
+
+pkgname = corefreq-server-git
+	pkgdesc = CoreFreq server
+	depends = corefreq-dkms
+	provides = corefreq-server
+	conflicts = corefreq-server
+
+pkgname = corefreq-dkms-git
+	pkgdesc = CoreFreq - kernel module sources
+	depends = dkms
+	provides = corefreq-dkms
+	conflicts = corefreq-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 454f0b405172..c1c8838f3bd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,67 @@
-# Maintainer: CyrIng <labs[at]cyring[dot]fr>
+# Maintainer: Leonidas Spyropoulos <artafinde at gmail dot com>
+# Contributor: CyrIng <labs[at]cyring[dot]fr>
+
+pkgbase=corefreq-git
+pkgname=(corefreq-client-git corefreq-server-git corefreq-dkms-git)
 _gitname=CoreFreq
-pkgname=corefreq-git
-realname=corefreq
-pkgver=1.84
+_pkgbase=corefreq
+pkgver=1.84.r13.gb9c84b0
 pkgrel=1
-pkgdesc="CoreFreq, Processor monitoring software with BIOS like functionalities"
 arch=('x86_64')
 url='https://github.com/cyring/CoreFreq'
 license=('GPL2')
 depends=('dkms')
-makedepends=('git')
-source=(git+${url}.git)
-md5sums=('SKIP')
-install=${realname}.install
-
-package() {
-	cd ${srcdir}/${_gitname}
-	BINDIR=${pkgdir}/bin
-	SRCTREE=${pkgdir}/usr/src
-	DRVTREE=${SRCTREE}/corefreqk-${pkgver}
-	# dkms setup
-	install -Dm 0644 Makefile ${DRVTREE}/Makefile
-	install -Dm 0644 dkms.conf ${DRVTREE}/dkms.conf
-	install -Dm 0755 scripter.sh ${DRVTREE}/scripter.sh
-	install -m 0644 *.c *.h ${DRVTREE}/
-	# systemd setup
-	install -Dm 0644 corefreqd.service \
-		${pkgdir}/usr/lib/systemd/system/corefreqd.service
+source=(git+"${url}.git#branch=develop"
+        'dkms.conf')
+b2sums=('SKIP'
+        'c6d8849944f99195038ac252d010d3e3001cd1dcaee57218c4a7f58fa313aa38842e4ea991d4d9ff7d04063ebaa9900c06ff1eacfa6270341cf37fb752adc00c')
+
+pkgver() {
+  cd "${_gitname}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+  cd "${_gitname}"
+  make corefreqd corefreq-cli
+}
+
+package_corefreq-dkms-git() {
+  pkgdesc="CoreFreq - kernel module sources"
+  depends=('dkms')
+  provides=("corefreq-dkms")
+  conflicts=('corefreq-dkms')
+  _kernelmodule=corefreqk
+
+  # Copy simple dkms.conf
+  install -Dm644 dkms.conf "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
+  # Set name and version
+  sed -e "s/@_PKGBASE@/${_pkgbase}/" \
+      -e "s/@PKGVER@/${pkgver}/" \
+      -e "s/@_KERNELMODULE@/${_kernelmodule}/" \
+      -i "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
+  
+  # Copy sources (including Makefile)
+  cp -r "${_gitname}"/{*.c,*.h,Makefile} "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/"
+}
+
+package_corefreq-server-git() {
+  pkgdesc="CoreFreq server"
+  depends=("corefreq-dkms")
+  provides=('corefreq-server')
+  conflicts=('corefreq-server')
+
+  cd "${_gitname}"
+  install -Dm755 corefreqd "${pkgdir}/usr/bin/corefreqd"
+  install -Dm 0644 corefreqd.service "${pkgdir}/usr/lib/systemd/system/corefreqd.service"
+}
+
+package_corefreq-client-git() {
+  pkgdesc="CoreFreq client"
+  depends=("corefreq-server")
+  provides=('corefreq-client')
+  conflicts=('corefreq-client')
+
+  cd "${_gitname}"
+  install -Dm755 corefreq-cli "${pkgdir}/usr/bin/corefreq-cli"
 }
diff --git a/corefreq.install b/corefreq.install
deleted file mode 100644
index 005e261eb0c3..000000000000
--- a/corefreq.install
+++ /dev/null
@@ -1,38 +0,0 @@
-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 '\n[ \033[1;36;40mCoreFreq\033[0m Starting Instructions\033[0m ]\n'\
-		'\n1: load the kernel module\n'\
-		' # \033[1;36;40mmodprobe corefreqk\033[0m\n'\
-		'\n2: start the daemon\n'\
-		' # \033[1;36;40msystemctl start corefreqd\033[0m\n'\
-		'\n3: run the client\n'\
-		' $ \033[1;36;40mcorefreq-cli\033[0m\n'
-}
-
-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
-}
diff --git a/dkms.conf b/dkms.conf
new file mode 100644
index 000000000000..93035bad1ebe
--- /dev/null
+++ b/dkms.conf
@@ -0,0 +1,7 @@
+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@"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/misc"
+AUTOINSTALL="yes"