From 49014d364950e5930a7218e324fba24bc5525593 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Thu, 22 Jan 2009 14:55:52 +0000
Subject: xserver plugin fixes:     * various fixes for suse-11.0     * various
 fixes for ubuntu-8.10 (thanks to Sebastian Schmelzer)     * rewritten linkage
 Module (now in Perl)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2515 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh')

diff --git a/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh b/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
index 68212ecf..b80348eb 100755
--- a/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
@@ -79,7 +79,7 @@ case ${TARGET} in
          --kernelsourcedir /usr/src/linux-headers-${KVER}/ \
          --no-prepare-kernel \
          --no-clean-kernel \
-         build \
+         rebuild \
     > /tmp/dkms.log 2>&1
     if [ $? -eq 0 ]; then
       echo "ok"
@@ -92,7 +92,8 @@ case ${TARGET} in
       exit 1
     fi
 
-    FGLRX_MODULE_PATH=$(find ${FGLRX_DKMS_DIR}/${KVER}/ -name fglrx.ko)
+    FGLRX_MODULE_PATH=$(find ${FGLRX_DKMS_DIR}/${KVER}/ -name fglrx.ko \
+            | tail -n1 )
 
     cp ${FGLRX_MODULE_PATH} ${PLUGIN_FOLDER}/ati/modules/fglrx.ko
 
@@ -174,7 +175,7 @@ case ${TARGET} in
          --kernelsourcedir /usr/src/linux-headers-${KVER}/ \
          --no-prepare-kernel \
          --no-clean-kernel \
-         build \
+         rebuild \
     > /tmp/dkms.log 2>&1
     if [ $? -eq 0 ]; then
       echo "ok"
@@ -187,7 +188,8 @@ case ${TARGET} in
       exit 1
     fi
 
-    NVIDIA_MODULE_PATH=$(find ${NVIDIA_DKMS_DIR}/${KVER}/ -name nvidia.ko)
+    NVIDIA_MODULE_PATH=$(find ${NVIDIA_DKMS_DIR}/${KVER}/ -name \
+            nvidia.ko | tail -n 1)
 
     cp ${NVIDIA_MODULE_PATH} ${PLUGIN_FOLDER}/nvidia/modules/nvidia.ko
 
-- 
cgit v1.2.3-55-g7522