Browse Source

Benjamin Schieder:


			
			
				rocklinux
			
			
		
Benjamin Schieder 20 years ago
parent
commit
b32a86cae3
3 changed files with 4 additions and 47 deletions
  1. +0
    -43
      package/tsa/nvidia/makeinst-fix.patch
  2. +2
    -2
      package/tsa/nvidia/nvidia.conf
  3. +2
    -2
      package/tsa/nvidia/nvidia.desc

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

@ -1,43 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/tsa/nvidia/makeinst-fix.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- 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.*

+ 2
- 2
package/tsa/nvidia/nvidia.conf

@ -23,14 +23,14 @@
main() {
sh $archdir/NVIDIA-Linux-x86-${ver}-pkg1.run --extract-only
cd NVIDIA-Linux-x86-${ver}-pkg1
patch -p1 < $confdir/*.patch
#patch -p1 < $confdir/*.patch
cd ..
# copy all nvidia sources to /usr/src/$xpkg
rm -rf $root/usr/src/$xpkg
mv -f NVIDIA-Linux-x86-${ver}-pkg1 $root/usr/src/$xpkg
install -m 0744 -o root -g root $confdir/install.sh $root/usr/src/$xpkg/
#install -m 0744 -o root -g root $confdir/install.sh $root/usr/src/$xpkg/
}
autoextract=0

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

@ -74,7 +74,7 @@
[L] Free-to-use
[S] Stable
#if xpkg == nvidia
[V] 1.0-7676
[V] 1.0-8762
#endif
#if xpkg == nvidia-legacy
[V] 1.0-7174
@ -83,7 +83,7 @@
[P] X -?---5---9 130.800
#if xpkg == nvidia
[D] 1685077456 NVIDIA-Linux-x86-1.0-7676-pkg1.run http://download.nvidia.com/XFree86/Linux-x86/1.0-7676/
[D] 176736931 NVIDIA-Linux-x86-1.0-8762-pkg1.run http://download.nvidia.com/XFree86/Linux-x86/1.0-8762/
#endif
#if xpkg == nvidia-legacy
[D] 1314333997 NVIDIA-Linux-x86-1.0-7174-pkg1.run http://download.nvidia.com/XFree86/Linux-x86/1.0-7174/

Loading…
Cancel
Save