wok-stable rev 7420

Fixed nvidia soft links. No need to cd into folders. Also added linux-module-headers to build depends.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Nov 28 07:13:52 2010 +0000 (2010-11-28)
parents 5d335118e140
children 2c1a92af611b
files nvidia/receipt
line diff
     1.1 --- a/nvidia/receipt	Sun Nov 28 12:56:09 2010 +0100
     1.2 +++ b/nvidia/receipt	Sun Nov 28 07:13:52 2010 +0000
     1.3 @@ -6,7 +6,7 @@
     1.4  MAINTAINER="jozee@slitaz.org"
     1.5  SHORT_DESC="NVIDIA drivers (non-free)"
     1.6  DEPENDS="linux xorg-server gtk+ cairo linux-agp linux-drm"
     1.7 -BUILD_DEPENDS="$DEPENDS"
     1.8 +BUILD_DEPENDS="$DEPENDS linux-module-headers"
     1.9  WEB_SITE="http://www.nvidia.com/"
    1.10  SOURCE="NVIDIA-Linux-x86-${VERSION}-pkg0"
    1.11  TARBALL="${SOURCE}.run"
    1.12 @@ -17,8 +17,6 @@
    1.13  compile_rules() {
    1.14  	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    1.15  	 WGET_URL="http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$TARBALL"
    1.16 -	 
    1.17 -    [ -d $WOK/linux/taz ] || tazwok cook linux
    1.18     
    1.19      cd $WOK/$PACKAGE
    1.20      [ -f $SOURCES_REPOSITORY/$TARBALL ] || wget $WGET_URL -P $SOURCES_REPOSITORY
    1.21 @@ -28,7 +26,7 @@
    1.22  	
    1.23  	cd $SOURCE/usr/src/nv/
    1.24  	sed -i 's|\.ioctl|// &|' nv.c # only use .unblocked_ioctl since 2.6.36
    1.25 -	make SYSSRC="$WOK/linux/linux-$KERNEL_VERSION" module 
    1.26 +	make SYSSRC="/usr/src/linux" module 
    1.27  }
    1.28  	
    1.29  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.30 @@ -57,23 +55,17 @@
    1.31  	cp -a $_pkg/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/
    1.32  	cp -a $_pkg/usr/X11R6/lib/* $fs/usr/lib/X11	
    1.33  	
    1.34 -	cd $fs/usr/lib/X11/modules/extensions
    1.35 -	ln -s libglx.so.$VERSION libglx.so
    1.36 -	
    1.37 -	 cd $fs/usr/lib/
    1.38 -     ln -s libGL.so.$VERSION libGL.so 
    1.39 -     ln -s libGL.so.$VERSION libGL.so.1 
    1.40 -     ln -s libGLcore.so.$VERSION libGLcore.so.1 
    1.41 -     ln -s libnvidia-cfg.so.$VERSION libnvidia-cfg.so.1 
    1.42 -     ln -s libnvidia-tls.so.$VERSION libnvidia-tls.so.1 
    1.43 -     ln -s libcuda.so.$VERSION libcuda.so.1 
    1.44 -     ln -s libcuda.so.$VERSION libcuda.so 
    1.45 -     ln -s libvdpau.so.$VERSION libvdpau.so.1 
    1.46 -     ln -s libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so.1
    1.47 -     
    1.48 -     cd $fs/usr/lib/X11
    1.49 -     ln -s libXvMCNVIDIA.so.$VERSION libXvMCNVIDIA_dynamic.so.1 
    1.50 -		
    1.51 +	ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so
    1.52 +	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so
    1.53 +	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so.1
    1.54 +	ln -s libGLcore.so.$VERSION $fs/usr/lib/libGLcore.so.1
    1.55 +	ln -s libnvidia-cfg.so.$VERSION $fs/usr/lib/libnvidia-cfg.so.1
    1.56 +	ln -s libnvidia-tls.so.$VERSION $fs/usr/lib/libnvidia-tls.so.1
    1.57 +	ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so.1
    1.58 +	ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so
    1.59 +	ln -s libvdpau.so.$VERSION $fs/usr/lib/libvdpau.so.1
    1.60 +	ln -s libvdpau_nvidia.so.$VERSION $fs/usr/lib/libvdpau_nvidia.so.1
    1.61 +	ln -s libXvMCNVIDIA.so.$VERSION $fs/usr/lib/X11/libXvMCNVIDIA_dynamic.so.1		
    1.62  }
    1.63  
    1.64  pre_install()
    1.65 @@ -83,8 +75,8 @@
    1.66  	echo "================================================================================"
    1.67  	echo "You are installing a package with proprietary license."
    1.68  	echo "You must accept the license."
    1.69 -    echo "================================================================================"
    1.70 -    echo ""
    1.71 +	echo "================================================================================"
    1.72 +	echo ""
    1.73  	
    1.74  }
    1.75  
    1.76 @@ -101,15 +93,15 @@
    1.77  	echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2"
    1.78  	echo "================================================================================"
    1.79  	echo "For installing this package, you have to accept the $PACKAGE license."
    1.80 -    echo "The license is stored in /usr/share/licenses/$PACKAGE "    
    1.81 -    echo -n "Would you like to read the license (y/N) : "; read anser
    1.82 -    if [ "$anser" = "y" ]; then
    1.83 +	echo "The license is stored in /usr/share/licenses/$PACKAGE "    
    1.84 +	echo -n "Would you like to read the license (y/N) : "; read anser
    1.85 +	if [ "$anser" = "y" ]; then
    1.86  		cat /usr/share/licenses/"$PACKAGE"/LICENSE | more	
    1.87  		echo "" 		
    1.88  	fi
    1.89  	echo "================================================================================"
    1.90 -	 echo -n "Do you accept the license (y/N) : "; read anser
    1.91 -    if [ "$anser" = "N" ]; then
    1.92 +	echo -n "Do you accept the license (y/N) : "; read anser
    1.93 +	if [ "$anser" = "N" ]; then
    1.94  		echo "You did not accept the license, Removing the pkg."	
    1.95  		tazpkg remove "$PACKAGE"		
    1.96  	fi