Browse Source

Juergen Sawinski <george@mpimf-heidelberg.mpg.de>

Updates the nvidia graphics card driver. 


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1017 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
b955a9858a
5 changed files with 43 additions and 28 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +10
    -9
      package/tsa/nvidia/install.sh
  3. +24
    -0
      package/tsa/nvidia/makeinst-fix.patch
  4. +6
    -16
      package/tsa/nvidia/nvidia.conf
  5. +2
    -3
      package/tsa/nvidia/nvidia.desc

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -16,6 +16,7 @@ whole rxr-tree.
- Daniel Jahre: fixed galeon13 and epiphany priority
- Daniel Pischl: updated gkrellm
- Sebastian Jaenicke: added pyslsk and wxpython and updates wxwindows
- Juergen Sawinski: updatated tsa/nvidia
*) 2003-08-03 (2.0.0-beta7 - 2.0.0-rc1)

+ 10
- 9
package/tsa/nvidia/install.sh

@ -12,19 +12,20 @@
# Author: Sebastian Jaenicke <sj-rocklinux@jaenicke.org>
#
NV_VERSION=4363
NV_VERSION=4496
export IGNORE_CC_MISMATCH=1
echo Installing GL libraries ..
cd NVIDIA_GLX-1.0-${NV_VERSION} && \
make install
echo Compiling kernel module ..
cd ../NVIDIA_kernel-1.0-${NV_VERSION} && \
make nvidia.o && \
install -m 0664 -o root -g root nvidia.o /lib/modules/`uname -r`/kernel/drivers/video/ && \
/sbin/depmod -a
CWD=$PWD
cd usr/src/nv
make nvidia.o
install -m 0664 -o root -g root nvidia.o /lib/modules/`uname -r`/kernel/drivers/video/nvidia.o
depmod -a
cd $CWD
echo Installing GL files ..
make install_gl
if [ "x`grep nvidia /etc/devfsd.conf`" = "x" ]; then
echo "Adding entries to /etc/devfsd.conf .."

+ 24
- 0
package/tsa/nvidia/makeinst-fix.patch

@ -0,0 +1,24 @@
--- NVIDIA-Linux-x86-1.0-4496-pkg2/Makefile.old 2003-07-29 13:40:28.000000000 +0200
+++ NVIDIA-Linux-x86-1.0-4496-pkg2/Makefile 2003-07-29 14:01:55.000000000 +0200
@@ -1,11 +1,4 @@
-default:
- @ echo
- @ echo "It is NOT recommended that you use this Makefile to install"
- @ echo "the NVIDIA driver. Instead, please use the nvidia-installer"
- @ echo "utility. However, should nvidia-installer not operate for you,"
- @ echo "you may use this Makefile as a last resort. To install using"
- @ echo "this Makefile, please run 'make install'."
- @ echo
+install: kernel_module_install install_gl
kernel_module_install:
cd usr/src/nv; make install
@@ -21,7 +14,7 @@
INSTALL_TLS := $(shell usr/bin/tls_test 2> /dev/null; if [ "$$?" = "0" ]; then echo "1"; else echo "0"; fi)
-install: kernel_module_install
+install_gl:
@echo "Removing all old and conflicting files!"
@echo -n " "
rm -f ${ROOT}/usr/lib/libGL.*

+ 6
- 16
package/tsa/nvidia/nvidia.conf

@ -21,24 +21,14 @@
# --- ROCK-COPYRIGHT-NOTE-END ---
main() {
sh $archdir/NVIDIA-Linux-x86-1.0-4496-pkg2.run --extract-only
patch -p0 < $confdir/*.patch
tar --no-same-owner $taropt $archdir/NVIDIA_kernel-$ver.tar.bz2
tar --no-same-owner $taropt $archdir/NVIDIA_GLX-$ver.tar.bz2
# copy all nvidia sources to /usr/src/nvidia
rm -rf $root/usr/src/nvidia
mv -f NVIDIA-Linux-x86-1.0-4496-pkg2 $root/usr/src/nvidia
# copy all nvidia sources to /usr/src/nvidia
mkdir -p $root/usr/src/nvidia
cp -rf NVIDIA_kernel-$ver $root/usr/src/nvidia
cp -rf NVIDIA_GLX-$ver $root/usr/src/nvidia
# "beautify" nvidia's unterstanding of *nix permissions
chmod -R 644 $root/usr/src/nvidia/NVIDIA_kernel-$ver/*
chmod 755 $root/usr/src/nvidia/NVIDIA_kernel-$ver/
cd $root/usr/src/nvidia/NVIDIA_kernel-$ver/
grep -v modprobe Makefile >Makefile.new
mv -fv Makefile.new Makefile
install -m 0744 -o root -g root $confdir/install.sh $root/usr/src/nvidia/
install -m 0744 -o root -g root $confdir/install.sh $root/usr/src/nvidia/
}
autoextract=0

+ 2
- 3
package/tsa/nvidia/nvidia.desc

@ -40,9 +40,8 @@
[L] Free-to-use
[S] Stable
[V] 1.0-4363
[V] 1.0-4496
[P] X -----5---9 368.000
[D] 3846880221 NVIDIA_kernel-1.0-4363.tar.gz ftp://download.nvidia.com/XFree86/Linux-x86/1.0-4363/
[D] 806043534 NVIDIA_GLX-1.0-4363.tar.gz ftp://download.nvidia.com/XFree86/Linux-x86/1.0-4363/
[D] 0 NVIDIA-Linux-x86-1.0-4496-pkg2.run http://download.nvidia.com/XFree86/Linux-x86/1.0-4496/

Loading…
Cancel
Save