xserver: *added suse-11.0 support (partial) for binary x11-drivers

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

2 files changed, 21 insertions, 1 deletions

diff --git a/os-plugins/plugins/xserver/files/linkage.sh b/os-plugins/plugins/xserver/files/linkage.sh
index 79e92a03..b607ce08 100755
--- a/os-plugins/plugins/xserver/files/linkage.sh
+++ b/os-plugins/plugins/xserver/files/linkage.sh
@@ -109,6 +109,7 @@ divert() {
       #TODO: Check this part. Every 2nd time of 'linkage.sh clean;linkage.sh both'
       #      the following error occurs:
       #      ln: creating symbolic link `/var/X11R6/lib//libGL.so.1/libGL.so.1': File exists
+      # this should not happen, because libGL.so.1 is no folder
       ln -s ${ROOT}${cmplib} ${LINK_PATH}$(echo ${cmplib} | sed -e 's/\/usr\/lib//g')
     else
 
@@ -144,6 +145,7 @@ uninstDist() {
   # somehow we have to repair this - what else? 
   # There is also a generic way, but this is only one file
   ln -sf /usr/lib/libGL.so.1.2 /usr/lib/libGL.so.1
+  ln -sf /usr/lib/libGL.so.1.2 /usr/lib/libGL.so
 
   # delete all remaining links to /opt/openslx and /var/X11R6/lib
   find /usr/lib -lname "${PLUGIN_PATH}*"  \
diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
index f158a45a..057be242 100755
--- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
@@ -48,8 +48,26 @@ if [ "$1" = "nvidia" ]; then
       find lib/ -name "*.ko" -exec mv {} ../modules \;
   fi
 
-  cd ..
+  if [ "11.0" = "$(lsb_release -r|sed 's/^.*\t//')" ]; then
+    # add repository for nvidia drivers
+    zypper addrepo http://download.nvidia.com/opensuse/11.0/ NVIDIA
+    # confirm authenticity of key (once) 
+    # -> After key is cached, this is obsolete
+    zypper se -r NVIDIA x11-video-nvidiaG01
+    # get URLs
+    zypper -n -vv install -D x11-video-nvidiaG01 > logfile
+
+    # take unique urls from logfile
+    URLS=$(cat logfile |  grep -P -o "http://.*? " | sort -u | xargs)
+    for RPM in $URLS; do
+      wget ${RPM}
+      RNAME=$(echo ${RPM} | sed -e 's,^.*/\(.*\)$,\1,g')
+      # TODO: the following is not working - I don't know why...
+      ${BUSYBOX} rpm2cpio ${RNAME} | ${BUSYBOX} cpio -idv 
+    done
+  fi
 
+  cd .. 
   # TODO: after development
   #rm -rf temp/
 fi