* added suse ati file preparation

  * works only against 10.2, usual kernel problem
  * cleaned up old stuff. We shouldn't need it anymore


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2151 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 7 insertions, 62 deletions

diff --git a/os-plugins/plugins/xserver/files/ati-install.sh b/os-plugins/plugins/xserver/files/ati-install.sh
index d9bed514..67959883 100755
--- a/os-plugins/plugins/xserver/files/ati-install.sh
+++ b/os-plugins/plugins/xserver/files/ati-install.sh
@@ -2,8 +2,6 @@
 
 cd /opt/openslx/plugin-repo/xserver
 
-
-
 # Ubuntu gfx-install.sh skript
 if [ "1" -eq "$(lsb_release -i | grep 'Ubuntu' | wc -l)" ]; then
   # we have Ubuntu - run ubuntu-gfx-install
@@ -13,64 +11,11 @@ if [ "1" -eq "$(lsb_release -i | grep 'Ubuntu' | wc -l)" ]; then
 fi
 # End ubuntu gfx-install.sh
 
-
-
-
-
-# check if its already installed
-if [ -d ati ]; then
-  echo "   * ati driver seems to be installed"
-  echo "     If you want to reinstall ati drivers press \"y\" or else we will exit"
-  read
-  if [ "${REPLY}" != "y" ]; then
-    echo "   * ati is already installed. Nothing to do."
-    exit
-  fi
-  echo "   * ati drivers will be reinstalled"
-  echo "   * deleting old files"
-  rm -rf ati/
+# SUSE gfx-install.sh skript
+if [ "1" -eq "$(lsb_release -i | grep 'SUSE' | wc -l)" ]; then
+  # we have SuSE - run ubuntu-gfx-install
+  echo "* Using SuSE packages to install modules and libs"
+  ./suse-gfx-install.sh ati
+  exit
 fi
-
-#TODO: check if we have ati files available (and not just nvidia's)
-FILE_ATI=$(ls packages/ati-driver-installer*.run|sort|tail -n 1)
-VERSION=$(head ${FILE_ATI} | grep "label=" | sed -e 's,.*Driver-\(.*\)",\1,g')
-
-mkdir ati
-mkdir ati/modules
-mkdir ati/atiroot
-cd ati
-
-#TODO: here we should do filecheck
-#../${FILE_ATI} --check
-
-# extract ati file
-../${FILE_ATI} --extract ./temp/ > /dev/null
-
-
-
-echo "  * build kernel modules"
-cd temp/common/lib/modules/fglrx/build_mod
-#TODO GCC4 haengt von GCC ab, hier version 4
-GCC_VERSION=4
-ln -s /opt/openslx/plugin-repo/xserver/ati/temp/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC${GCC_VERSION} .
-cp 2.6.x/Makefile .
-uname_r=$(find /lib/modules/2.6* -maxdepth 0|sed 's,/lib/modules/,,g'|sort|tail -n1)
-sed -i "s,^KVER.*$,KVER = ${uname_r}," Makefile
-# TODO: less verbose
-make -C /lib/modules/${uname_r}/build M=$(pwd) GCC_VER_MAJ=${GCC_VERSION}
-
-cd /opt/openslx/plugin-repo/xserver/ati
-
-echo "  * move kernel modules"
-mv temp/common/lib/modules/fglrx/build_mod/fglrx.ko modules/
-mv temp/common/* atiroot
-cp -r temp/arch/x86/* atiroot/
-rm -rf atiroot/lib
-rm -rf atiroot/opt
-rm -rf atiroot/usr/src
-
-# Todo: keep it for development purpose
-#rm -rf temp/
-
-sh
-
+# End ubuntu gfx-install.sh