15.12-6: removed dkms commands from install script

3 files changed, 2 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 246eed363179..6038e7737418 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = catalyst-test
 	pkgdesc = AMD/ATI Catalyst drivers for linux AKA Crimson. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. PRE-GCN Radeons ARE NOT SUPPORTED
 	pkgver = 15.12
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.amd.com
 	install = catalyst-test.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 6d3be1623a92..8167224b97b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@
 
 pkgname=catalyst-test
 pkgver=15.12
-pkgrel=5
+pkgrel=6
 # _betano=1.0
 _amdver=15.302
 pkgdesc="AMD/ATI Catalyst drivers for linux AKA Crimson. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. PRE-GCN Radeons ARE NOT SUPPORTED"
diff --git a/catalyst-test.install b/catalyst-test.install
index 6c8794f0c409..62094ecde3cc 100644
--- a/catalyst-test.install
+++ b/catalyst-test.install
@@ -61,21 +61,13 @@ pre_upgrade(){
     systemctl disable catalyst-hook.service
     # remove existing  fglrx modules
     usr/bin/catalyst_build_module ra
-
-    #this is lordheavy's old section, have to check if it's still needed - V.
-    local curver=$2
-    # $2 is unset due to a bug. Query current version using pacman as fallback
-    [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}')
-    pre_remove $curver
 }
 
 post_install(){
-    dkms install -m fglrx -v $1
     whisperer
 }
 
 post_upgrade(){
-    dkms install -m fglrx -v $1
     whisperer
 
     ## switch to intel if it was intel before upgrade    
@@ -89,10 +81,6 @@ post_upgrade(){
     fi
 }
 
-pre_remove(){
-    dkms remove -m fglrx -v $1 --all
-}
-
 post_remove(){
     # remove log
     rm -f var/log/catalyst-install.log