Made package working again.

9 files changed, 94 insertions, 158 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03f2e781c8b1..2576ddede4d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = phc-intel
-	pkgdesc = Frequency driver for Intel CPUs with undervolting feature
-	pkgver = 0.3.2.12.43
+	pkgdesc = Frequency driver for Intel CPUs with undervolting feature. DKMS-based kernel module, stable branch.
+	pkgver = 0.3.2.rev44
 	pkgrel = 1
 	url = https://gitlab.com/linux-phc/phc-intel
 	arch = any
-	license = GPL
+	groups = linux-phc
+	groups = phc-intel
+	license = GPL2
 	depends = dkms
+	optdepends = phc-intel-scripts: To control the driver.
 	provides = linux-phc
-	backup = etc/default/phc-intel
-	source = https://gitlab.com/linux-phc/phc-intel/-/archive/9e5391b64977bdfc878c9e6481030d274930f2c9/phc-intel-9e5391b64977bdfc878c9e6481030d274930f2c9.tar.gz
-	source = phc-intel.default
-	source = phc-intel.sh
-	source = phc-intel.sleep
-	source = phc-intel.system-sleep
-	source = dkms.conf
-	sha256sums = e46fb4cbfc26f64ce552230e1ebe044c85fea3afb720458197b573ef32df4129
-	sha256sums = ce08a5a4107be1d5723f1f169d515e67b6c77893f3994fc2d0d2ccf611307ed3
-	sha256sums = b526f3e8e66f6495531f13f2e6867d3a07b2ec7a7c3b8aa061f22be1cd6e770f
-	sha256sums = 569b85988cb38380fec85c25688b76abc24a46601aa8f58eb24eaebf863eebef
-	sha256sums = 2e17c90d7bfae8f5070e46388e95d443188eaa7beb5ffdd418a0da090f2e7557
-	sha256sums = 7b44882a96eeb7c79dbb7fe5b1ff8cded68c2b6a374c95bdc5e08c414cfd3549
+	provides = phc-intel-dkms=0.3.2.rev44
+	provides = phc-intel-dkms-stable=0.3.2.rev44
+	provides = phc-intel-patch=0.3.2.rev44
+	provides = PHC-INTEL-MODULE
+	conflicts = phc-intel-dkms
+	source = https://gitlab.com/linux-phc/phc-intel/-/archive/rev44/phc-intel-rev44.tar.bz2
+	source = dkms.conf.in
+	sha256sums = f3b70962e94c604adf9285f06ed1f1aaadcdee88f9ddf213255ed96c97d0c096
+	sha256sums = 9162c25d0df436a00d8b45d9e97c24a1f2999f5b8a4f78f2995df15d2d31baa7
 
 pkgname = phc-intel
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 19486ec1cb8a..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*
-!.gitignore
-!PKGBUILD
-!.SRCINFO
-!dkms.conf
-!phc-intel.*
diff --git a/PKGBUILD b/PKGBUILD
index 0af1bf7e1501..c21bea540eb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,89 @@
-# Maintainer: adrien1018 <adrien.sf.wu[at]gmail[dot]com>
-# Contributor: fs4000 <matthias_dienstbier[at]yahoo[dot]de>
-# Contributor: trapanator <trap[at]trapanator[dot]com>
-# Contributor: tomprogrammer <Thomas-Bahn[at]gmx[dot]net>
+# Maintainer: dreieck (https://aur.archlinux.org/account/dreieck)
+# Contributor: adrien1018 (https://aur.archlinux.org/account/adrien1018)
+# Contributor: fs4000
+# Contributor: trapanator
+# Contributor: tomprogrammer
 
 pkgname=phc-intel
-_phcver=0.3.2
-pkgver=$_phcver.12.43
+groups=(
+  'linux-phc'
+  'phc-intel'
+)
+_downloadver=rev44 # Set this to specify what to download.
+pkgver=0.3.2.rev44
 pkgrel=1
-pkgdesc="Frequency driver for Intel CPUs with undervolting feature"
+pkgdesc="Frequency driver for Intel CPUs with undervolting feature. DKMS-based kernel module, stable branch."
 url="https://gitlab.com/linux-phc/phc-intel"
 arch=('any')
-license=('GPL')
-depends=('dkms')
-provides=('linux-phc')
-backup=('etc/default/phc-intel')
-_commit_hash='9e5391b64977bdfc878c9e6481030d274930f2c9'
-source=("https://gitlab.com/linux-phc/phc-intel/-/archive/$_commit_hash/phc-intel-$_commit_hash.tar.gz"
-        phc-intel.{default,sh,sleep,system-sleep} dkms.conf)
-sha256sums=('e46fb4cbfc26f64ce552230e1ebe044c85fea3afb720458197b573ef32df4129'
-            'ce08a5a4107be1d5723f1f169d515e67b6c77893f3994fc2d0d2ccf611307ed3'
-            'b526f3e8e66f6495531f13f2e6867d3a07b2ec7a7c3b8aa061f22be1cd6e770f'
-            '569b85988cb38380fec85c25688b76abc24a46601aa8f58eb24eaebf863eebef'
-            '2e17c90d7bfae8f5070e46388e95d443188eaa7beb5ffdd418a0da090f2e7557'
-            '7b44882a96eeb7c79dbb7fe5b1ff8cded68c2b6a374c95bdc5e08c414cfd3549')
+license=('GPL2')
+depends=(
+  'dkms'
+)
+makedepends=()
+optdepends=(
+  'phc-intel-scripts: To control the driver.'
+)
+provides=(
+  'linux-phc'
+  "phc-intel-dkms=${pkgver}"
+  "phc-intel-dkms-stable=${pkgver}"
+  "phc-intel-patch=${pkgver}" # It provides also the kernel patches.
+  "PHC-INTEL-MODULE"          # This means kernel-side support; packages providing kernel module, but also kernel packages which have that builtin, can set this.
+)
+conflicts=(
+  "phc-intel-dkms"
+)
+source=(
+  "https://gitlab.com/linux-phc/phc-intel/-/archive/${_downloadver}/phc-intel-${_downloadver}.tar.bz2"
+  'dkms.conf.in'
+)
+sha256sums=(
+  'f3b70962e94c604adf9285f06ed1f1aaadcdee88f9ddf213255ed96c97d0c096' # Main source
+  '9162c25d0df436a00d8b45d9e97c24a1f2999f5b8a4f78f2995df15d2d31baa7' # dkms.conf.in
+)
 
 prepare() {
-	cd $pkgname-$_commit_hash
-	sed -i 's,/sbin/modprobe phc-intel |,/sbin/modprobe phc-intel \&\& /usr/bin/phc-intel set |,' phc-intel.modprobe
+  cd "phc-intel-${_downloadver}"
+
+  ## Switch to stable branch:
+  make canny
+}
+
+pkgver() {
+  cd "phc-intel-${_downloadver}"
+
+  _ver="$(grep -E '^[[:space:]]*VERSION[[:space:]]*=' Makefile | tail -n1 | sed -E -e 's|^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*||' -e 's|[[:space:]]*#.*$||')"
+  _upstreamrev="${_downloadver}"
+  if [ -z "${_ver}" ]; then
+    error "Could not determine version."
+    return 1
+  else
+    printf '%s' "${_ver}.${_upstreamrev}"
+  fi
+}
+
+build() {
+  cd "${srcdir}"
+
+  sed -E -e "s|%%VERSION%%|${pkgver}|g" dkms.conf.in > dkms.conf
 }
 
 package() {
-	umask 022
-	install -Dm644 dkms.conf "$pkgdir/usr/src/phc-intel-$_phcver/dkms.conf"
-	install -Dm644 phc-intel.default "$pkgdir/etc/default/phc-intel"
-	install -Dm755 phc-intel.sh "$pkgdir/usr/bin/phc-intel"
-	install -Dm755 phc-intel.sleep "$pkgdir/usr/lib/pm-utils/sleep.d/00phc-intel"
-	install -Dm755 phc-intel.system-sleep "$pkgdir/usr/lib/systemd/system-sleep/phc-intel"
-
-	cd $pkgname-$_commit_hash
-	install -Dm644 phc-intel.modprobe "$pkgdir/usr/lib/modprobe.d/phc-intel.conf"
-	cp -R inc Makefile "$pkgdir/usr/src/phc-intel-$_phcver/"
+  cd "phc-intel-${_downloadver}"
+
+  umask 022
+  install -dvm755                        "${pkgdir}/usr/src/phc-intel-${pkgver}"
+  install -Dvm644 "${srcdir}/dkms.conf"  "${pkgdir}/usr/src/phc-intel-${pkgver}/dkms.conf"
+
+  install -Dvm644 "phc-intel.modprobe"   "${pkgdir}/usr/lib/modprobe.d/phc-intel.conf"
+  cp -Rv inc Makefile                    "${pkgdir}/usr/src/phc-intel-${pkgver}"/
+
+  for _docfile in changelog README.1st; do
+    install -Dvm644 "${_docfile}"        "${pkgdir}/usr/share/doc/${_pkgname}/$(basename "${_docfile}")"
+  done
+  install -dvm755                        "${pkgdir}/usr/share/doc/${_pkgname}/docs"
+  cp -rv docs/*                          "${pkgdir}/usr/share/doc/${_pkgname}/docs"/
+
+  install -Dvm644 gpl-2.0.txt            "${pkgdir}/usr/share/licenses/${pkgname}/gpl-2.0.txt"
+  ln -svf "/usr/share/licenses/${pkgname}/gpl-2.0.txt"  "${pkgdir}/usr/share/doc/${_pkgname}/LICENSE"
 }
diff --git a/dkms.conf b/dkms.conf.in
index db660379ac53..617d10b97018 100644
--- a/dkms.conf
+++ b/dkms.conf.in
@@ -1,5 +1,5 @@
 PACKAGE_NAME="phc-intel"
-PACKAGE_VERSION=0.3.2
+PACKAGE_VERSION=%%VERSION%%
 AUTOINSTALL="yes"
 
 BUILT_MODULE_NAME[0]="phc-intel"
diff --git a/phc-intel.default b/phc-intel.default
deleted file mode 100644
index 4e390e7684a4..000000000000
--- a/phc-intel.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# configuration for phc-intel
-
-# voltage IDs to be set for all CPUs
-VIDS=""
diff --git a/phc-intel.install b/phc-intel.install
deleted file mode 100644
index fb69a8b4a045..000000000000
--- a/phc-intel.install
+++ /dev/null
@@ -1,32 +0,0 @@
-post_install() {
-	cat <<-EOF
-		You can enter the desired voltage IDs in /etc/default/phc-intel.
-		Booting with nophc kernel parameter skips setting of VIDs in case of failure.
-	EOF
-}
-
-pre_upgrade() {
-	if (( "$(vercmp $2 0.3.2.12.19-2)" < 0 )); then
-		cd usr/lib/modules/
-		for i in *; do
-			if [ -f "$i/extramodules/phc-intel.ko" ]; then
-				rm -f "$i/extramodules/phc-intel.ko"
-				[ -d "$i/kernel" ] && depmod "$i"
-			elif [ -f "$i/phc-intel.ko" ]; then
-				rm -f "$i/phc-intel.ko"
-				rmdir -p --ignore-fail-on-non-empty "$i"
-			elif [ -f "$i/extra/phc-intel.ko" ]; then
-				rm -f "$i/extra/phc-intel.ko"
-				rmdir -p --ignore-fail-on-non-empty "$i/extra"
-				[ -d "$i/kernel" ] && depmod "$i"
-			fi
-		done
-	fi
-}
-
-post_upgrade() {
-	if (( "$(vercmp $2 0.3.2.12.19-2)" < 0 )); then
-		rm -rf usr/src/phc-intel/
-		echo '===> The kernel module gets automatically built by DKMS now.'
-	fi
-}
diff --git a/phc-intel.sh b/phc-intel.sh
deleted file mode 100644
index cce4bf96ad91..000000000000
--- a/phc-intel.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash -e
-shopt -s nullglob
-
-case "$1" in
-start)
-	. /etc/default/phc-intel
-	if [ -z "$VIDS" ]; then
-		echo '=> Please edit /etc/default/phc-intel'
-		exit 1
-	fi
-	echo ':: Setting PHC VIDs'
-	for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
-		echo $VIDS > "$i"
-	done
-	;;
-stop)
-	echo ':: Resetting default PHC VIDs'
-	for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
-		cp "${i%vids}default_vids" "$i"
-	done
-	;;
-status)
-	check_off () {
-		for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
-			[ "$(< "$i")" = "$(< "${i%vids}default_vids")" ] || return;
-		done
-	}
-	check_on () {
-		for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
-			[[ "$(< "$i")" =~ "$VIDS" ]] || return;
-		done
-	}
-	echo -n 'PHC status: '
-	. /etc/default/phc-intel
-	if check_off; then
-		echo 'inactive'
-	elif check_on; then
-		echo 'active'
-	else
-		echo 'unknown'
-	fi
-	;;
-set)
-	. /etc/default/phc-intel
-	[ -z "$VIDS" ] && exit
-	for i in $(< /proc/cmdline); do
-		[ $i = nophc ] && exit
-	done
-	for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
-		echo $VIDS > "$i"
-	done
-	;;
-*)
-	echo "usage: $0 {start|stop|status|set}"
-esac
diff --git a/phc-intel.sleep b/phc-intel.sleep
deleted file mode 100644
index 342b81acf831..000000000000
--- a/phc-intel.sleep
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-case $1 in
-	resume|thaw)
-		. /usr/bin/phc-intel set
-		;;
-esac
diff --git a/phc-intel.system-sleep b/phc-intel.system-sleep
deleted file mode 100644
index c76ea6aafda0..000000000000
--- a/phc-intel.system-sleep
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = post ]; then
-	. /usr/bin/phc-intel set
-fi