diff options
author | Matthias Dienstbier | 2016-02-27 12:04:11 +0100 |
---|---|---|
committer | Matthias Dienstbier | 2016-02-27 12:04:11 +0100 |
commit | f4268eec75142ddc807482509ca1dbf060bb4b9d (patch) | |
tree | 139fdd6559b016e51e63e9acbd2c8ff5820103f1 | |
parent | 5124a38051185759d2292362d396b0ddc66f5d91 (diff) | |
download | aur-f4268eec75142ddc807482509ca1dbf060bb4b9d.tar.gz |
Update to 0.4.6-2
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 23 | ||||
-rw-r--r-- | dkms.conf | 6 | ||||
-rw-r--r-- | phc-k8.install | 50 | ||||
-rw-r--r-- | phc-k8.sh | 37 |
5 files changed, 60 insertions, 67 deletions
@@ -1,11 +1,16 @@ +# Generated by mksrcinfo v8 +# Sat Feb 27 11:03:51 UTC 2016 pkgbase = phc-k8 pkgdesc = frequency driver for AMD CPUs with undervolting feature pkgver = 0.4.6 - pkgrel = 1 + pkgrel = 2 url = http://www.linux-phc.org install = phc-k8.install arch = any license = GPL + depends = dkms + optdepends = linux-headers + optdepends = linux-lts-headers provides = linux-phc backup = etc/default/phc-k8 backup = etc/modprobe.d/phc-k8.conf @@ -14,11 +19,13 @@ pkgbase = phc-k8 source = phc-k8.sh source = phc-k8.sleep source = phc-k8.system-sleep + source = dkms.conf sha256sums = 33c6041f314cfe25b7cded4b71736a3986781c505209c1af766723a12d37b53b sha256sums = 352a97272390ed428cc1ebb886ebb044e7b54c145aa7a4c0d96862ad7a7fd46a - sha256sums = 8b4638f406249bf3e54604bfd282af6886be1c817045d586471383ea3b251fbf + sha256sums = 830685d3f86d70965bb5d2e617372f8d6badb0bfc5cbf644569afbf925b045de sha256sums = 8619514df4b931705f713d61c1288b6e6960d578067523604b75960dcbc6e778 sha256sums = 74ae72d992d0205babd6c9428e637ca407fb26461bfc68da7f331945126b810a + sha256sums = 1e0ce430a338fc2747c2d2cdd23c1365dbd2e4b20c83cc600a8d641d6d7c9a0e pkgname = phc-k8 @@ -1,31 +1,34 @@ -# Contributor: fs4000 <matthias_dienstbier[at]yahoo[dot]de> +# Maintainer: fs4000 <matthias_dienstbier[at]yahoo[dot]de> pkgname=phc-k8 pkgver=0.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="frequency driver for AMD CPUs with undervolting feature" url="http://www.linux-phc.org" arch=('any') license=('GPL') +depends=('dkms') +optdepends=('linux-headers' 'linux-lts-headers') provides=('linux-phc') -backup=(etc/default/phc-k8 etc/modprobe.d/phc-k8.conf) +backup=('etc/default/phc-k8' 'etc/modprobe.d/phc-k8.conf') install=phc-k8.install source=(phc-k8-$pkgver.tar.gz::$url/forum/download/file.php?id=165 - phc-k8.{default,sh,sleep,system-sleep}) + phc-k8.{default,sh,sleep,system-sleep} + dkms.conf) sha256sums=('33c6041f314cfe25b7cded4b71736a3986781c505209c1af766723a12d37b53b' '352a97272390ed428cc1ebb886ebb044e7b54c145aa7a4c0d96862ad7a7fd46a' - '8b4638f406249bf3e54604bfd282af6886be1c817045d586471383ea3b251fbf' + '830685d3f86d70965bb5d2e617372f8d6badb0bfc5cbf644569afbf925b045de' '8619514df4b931705f713d61c1288b6e6960d578067523604b75960dcbc6e778' - '74ae72d992d0205babd6c9428e637ca407fb26461bfc68da7f331945126b810a') + '74ae72d992d0205babd6c9428e637ca407fb26461bfc68da7f331945126b810a' + '1e0ce430a338fc2747c2d2cdd23c1365dbd2e4b20c83cc600a8d641d6d7c9a0e') prepare() { cd phc-k8_v$pkgver - sed -e 's,lib/modules/$(KERNELVERSION)/updates/kernel/arch/x86/kernel/cpu/cpufreq,usr/lib/modules/$(KERNELVERSION)/extramodules,'\ - -e 's,^\tinstall -m 644 -o root -g root phc-k8.modprobe,#\tinstall -m 644 -o root -g root phc-k8.modprobe,' -i Makefile sed -i 's,/sbin/modprobe phc-k8 |,/sbin/modprobe phc-k8 \&\& /usr/bin/phc-k8 set |,' phc-k8.modprobe } package() { + install -Dm644 dkms.conf "$pkgdir/usr/src/phc-k8-$pkgver/dkms.conf" install -Dm644 phc-k8.default "$pkgdir/etc/default/phc-k8" install -Dm755 phc-k8.sh "$pkgdir/usr/bin/phc-k8" install -Dm755 phc-k8.sleep "$pkgdir/usr/lib/pm-utils/sleep.d/00phc-k8" @@ -33,7 +36,7 @@ package() { cd phc-k8_v$pkgver install -Dm644 phc-k8.modprobe "$pkgdir/etc/modprobe.d/phc-k8.conf" - install -d "$pkgdir/usr/src/phc-k8/" "$pkgdir/usr/share/doc/phc-k8/" + install -d "$pkgdir/usr/share/doc/phc-k8" install -m644 Changelog README "$pkgdir/usr/share/doc/phc-k8/" - install -m644 Makefile mperf.? phc-k8.? "$pkgdir/usr/src/phc-k8/" + install -m644 Makefile mperf.? phc-k8.? "$pkgdir/usr/src/phc-k8-$pkgver/" } diff --git a/dkms.conf b/dkms.conf new file mode 100644 index 000000000000..ea8e96949495 --- /dev/null +++ b/dkms.conf @@ -0,0 +1,6 @@ +PACKAGE_NAME="phc-k8" +PACKAGE_VERSION=0.4.6 +AUTOINSTALL="yes" + +BUILT_MODULE_NAME[0]="phc-k8" +DEST_MODULE_LOCATION[0]="/extra" diff --git a/phc-k8.install b/phc-k8.install index b167ea823c85..0e176f1e0a85 100644 --- a/phc-k8.install +++ b/phc-k8.install @@ -1,30 +1,32 @@ post_install() { - cat << EOF -Run "phc-k8 setup" to build the module for current kernel. -You can enter the desired voltage IDs in /etc/default/phc-k8. -Booting with nophc kernel parameter skips setting of VIDs in case of failure. -EOF + cat <<-EOF + You can enter the desired voltage IDs in /etc/default/phc-k8. + Booting with nophc kernel parameter skips setting of VIDs in case of failure. + EOF } -post_upgrade() { - rm -f var/log/phc-k8.log +pre_upgrade() { + if (( "$(vercmp $2 0.4.6-2)" < 0 )); then + cd usr/lib/modules/ + for i in *; do + if [ -f "$i/extramodules/phc-k8.ko" ]; then + rm -f "$i"/extramodules/{mperf,phc-k8}.ko + [ -d "$i/kernel" ] && depmod "$i" + elif [ -f "$i/phc-k8.ko" ]; then + rm -f "$i"/{mperf,phc-k8}.ko + rmdir -p --ignore-fail-on-non-empty "$i" + elif [ -d "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq" ]; then + rm -f "$i"/updates/kernel/arch/x86/kernel/cpu/cpufreq/{mperf,phc-k8}.ko + rmdir -p --ignore-fail-on-non-empty "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq" + [ -d "$i/kernel" ] && depmod "$i" + fi + done + fi } -post_remove() { - echo Removing built modules ... - rm -rf usr/src/phc-k8/ - cd usr/lib/modules/ - for i in *; do - if [ -f "$i/extramodules/phc-k8.ko" ]; then - rm -f "$i"/extramodules/{mperf,phc-k8}.ko - [ -d "$i/kernel" ] && depmod "$i" - elif [ -f "$i/phc-k8.ko" ]; then - rm -f "$i"/{mperf,phc-k8}.ko - rmdir -p --ignore-fail-on-non-empty "$i" - elif [ -d "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq" ]; then - rm -f "$i"/updates/kernel/arch/x86/kernel/cpu/cpufreq/{mperf,phc-k8}.ko - rmdir -p --ignore-fail-on-non-empty "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq" - [ -d "$i/kernel" ] && depmod "$i" - fi - done +post_upgrade() { + if (( "$(vercmp $2 0.4.6-2)" < 0 )); then + rm -rf usr/src/phc-k8/ + echo '===> The kernel module gets automatically built by DKMS now.' + fi } diff --git a/phc-k8.sh b/phc-k8.sh index 734c76c5f92e..c777d9e5c1d8 100644 --- a/phc-k8.sh +++ b/phc-k8.sh @@ -15,19 +15,19 @@ start) ;; stop) echo ':: Resetting default PHC VIDs' - for i in /sys/devices/system/cpu/cpu*/cpufreq; do - [ -e "$i/phc_default_vids" -a -e "$i/phc_vids" ] && cp "$i"/phc_{default_,}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; do - [ "$(< $i/phc_vids)" = "$(< $i/phc_default_vids)" ] || return; + 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; + [[ "$(< "$i")" =~ "$VIDS" ]] || return; done } echo -n 'PHC status: ' @@ -40,31 +40,6 @@ status) echo 'unknown' fi ;; -setup) - echo ':: Removing old phc-k8 modules' - echo - for i in /usr/lib/modules/*; do - if [ -f "$i/phc-k8.ko" -a ! -f "$i/version" ]; then - rm -f "$i"/{mperf,phc-k8}.ko - rmdir --ignore-fail-on-non-empty "$i" - elif [ -d "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq" -a ! -d "$i/kernel" ]; then - rm -f "$i"/updates/kernel/arch/x86/kernel/cpu/cpufreq/{mperf,phc-k8}.ko - rmdir -p --ignore-fail-on-non-empty "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq" - fi - done - echo ':: Compiling new phc-k8 module' - echo - cd /usr/src/phc-k8/ - make - echo - echo ':: Installing new phc-k8 module' - echo - make install - echo - echo ':: Cleaning up' - echo - make clean - ;; set) . /etc/default/phc-k8 [ -z "$VIDS" ] && exit @@ -76,5 +51,5 @@ set) done ;; *) - echo "usage: $0 {start|stop|status|setup|set}" + echo "usage: $0 {start|stop|status|set}" esac |