wok-undigest rev 427

nvidia-*: update for cook
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Sep 04 17:13:50 2011 +0200 (2011-09-04)
parents 1b1f881e82f7
children 38f3339bb860
files nvidia-173xx/receipt nvidia-96xx/receipt
line diff
     1.1 --- a/nvidia-173xx/receipt	Sun Sep 04 16:18:41 2011 +0200
     1.2 +++ b/nvidia-173xx/receipt	Sun Sep 04 17:13:50 2011 +0200
     1.3 @@ -5,56 +5,46 @@
     1.4  CATEGORY="network"
     1.5  MAINTAINER="jozee@slitaz.org"
     1.6  SHORT_DESC="NVIDIA drivers (non-free)"
     1.7 -DEPENDS="linux xorg-server gtk+ cairo linux-agp"
     1.8 -BUILD_DEPENDS="$DEPENDS"
     1.9  WEB_SITE="http://www.nvidia.com/"
    1.10  SOURCE="NVIDIA-Linux-x86-${VERSION}-pkg0"
    1.11  TARBALL="${SOURCE}.run"
    1.12 +RUN_OPTS="--extract-only"
    1.13  TAGS="drivers graphic video"
    1.14  
    1.15 +DEPENDS="linux xorg-server gtk+ cairo linux-agp linux-drm"
    1.16 +BUILD_DEPENDS="linux-module-headers coreutils-file-summarize"
    1.17 +
    1.18  # Rules to configure and make the package.
    1.19  
    1.20 -compile_rules() {
    1.21 -	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    1.22 -	 WGET_URL="http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$TARBALL"
    1.23 -	 
    1.24 -    [ -d $WOK/linux/taz ] || tazwok cook linux
    1.25 -   
    1.26 -    cd $WOK/$PACKAGE
    1.27 -    [ -f $TARBALL ] || wget $WGET_URL
    1.28 -    
    1.29 -	chmod +x $TARBALL
    1.30 -	sh $TARBALL --extract-only
    1.31 -	
    1.32 -	cd $SOURCE/usr/src/nv/
    1.33 -	make SYSSRC="$WOK/linux/linux-$KERNEL_VERSION" module 
    1.34 +compile_rules()
    1.35 +{
    1.36 +	cd $src/usr/src/nv/
    1.37 +	make SYSSRC="/usr/src/linux" module 2>&1 | sed s'/ERROR:/error:/'
    1.38  }
    1.39  	
    1.40  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.41  genpkg_rules()
    1.42  {	
    1.43 -	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    1.44 -	EXTRAVERSION=_$KERNEL_VERSION
    1.45 -	_pkg="$WOK/$PACKAGE/$SOURCE"
    1.46 +	EXTRAVERSION=_${kvers}
    1.47  	
    1.48  	mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE \
    1.49  				 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video \
    1.50  				 $fs/usr/share/doc/$PACKAGE 
    1.51  	
    1.52  	# Compress and install module
    1.53 -	lzma e $_pkg/usr/src/nv/nvidia.ko \
    1.54 +	lzma e $src/usr/src/nv/nvidia.ko \
    1.55  			$fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/nvidia.ko.gz
    1.56  	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/nvidia.ko.gz
    1.57  	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/nvidia.ko.gz	
    1.58  	
    1.59 -	cp -a $_pkg/LICENSE $fs/usr/share/licenses/$PACKAGE
    1.60 -	cp -a $_pkg/usr/bin $fs/usr
    1.61 -	cp -a $_pkg/nvidia-installer $fs/usr/bin
    1.62 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib/
    1.63 -	cp -a $_pkg/usr/lib/tls $fs/usr/lib/
    1.64 -	cp -a $_pkg/usr/share/pixmaps $fs/usr/share
    1.65 -	cp -a $_pkg/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/
    1.66 -	cp -a $_pkg/usr/X11R6/lib/* $fs/usr/lib/X11	
    1.67 +	cp -a $src/LICENSE $fs/usr/share/licenses/$PACKAGE
    1.68 +	cp -a $src/usr/bin $fs/usr
    1.69 +	cp -a $src/nvidia-installer $fs/usr/bin
    1.70 +	cp -a $src/usr/lib/*.so* $fs/usr/lib/
    1.71 +	cp -a $src/usr/lib/tls $fs/usr/lib/
    1.72 +	cp -a $src/usr/share/pixmaps $fs/usr/share
    1.73 +	cp -a $src/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/
    1.74 +	cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11	
    1.75  		
    1.76  }
    1.77  
     2.1 --- a/nvidia-96xx/receipt	Sun Sep 04 16:18:41 2011 +0200
     2.2 +++ b/nvidia-96xx/receipt	Sun Sep 04 17:13:50 2011 +0200
     2.3 @@ -5,56 +5,46 @@
     2.4  CATEGORY="network"
     2.5  MAINTAINER="jozee@slitaz.org"
     2.6  SHORT_DESC="NVIDIA drivers (non-free)"
     2.7 -DEPENDS="linux xorg-server gtk+ cairo linux-agp"
     2.8 -BUILD_DEPENDS="$DEPENDS"
     2.9  WEB_SITE="http://www.nvidia.com/"
    2.10  SOURCE="NVIDIA-Linux-x86-${VERSION}-pkg0"
    2.11  TARBALL="${SOURCE}.run"
    2.12 +RUN_OPTS="--extract-only"
    2.13  TAGS="drivers graphic video"
    2.14  
    2.15 +DEPENDS="linux xorg-server gtk+ cairo linux-agp linux-drm"
    2.16 +BUILD_DEPENDS="linux-module-headers coreutils-file-summarize"
    2.17 +
    2.18  # Rules to configure and make the package.
    2.19  
    2.20 -compile_rules() {
    2.21 -	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    2.22 -	 WGET_URL="http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$TARBALL"
    2.23 -	 
    2.24 -    [ -d $WOK/linux/taz ] || tazwok cook linux
    2.25 -   
    2.26 -    cd $WOK/$PACKAGE
    2.27 -    [ -f $TARBALL ] || wget $WGET_URL
    2.28 -    
    2.29 -	chmod +x $TARBALL
    2.30 -	sh $TARBALL --extract-only
    2.31 -	
    2.32 -	cd $SOURCE/usr/src/nv/
    2.33 -	make SYSSRC="$WOK/linux/linux-$KERNEL_VERSION" module 
    2.34 +compile_rules()
    2.35 +{
    2.36 +	cd $src/usr/src/nv/
    2.37 +	make SYSSRC="/usr/src/linux" module 2>&1 | sed s'/ERROR:/error:/'
    2.38  }
    2.39  	
    2.40  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.41  genpkg_rules()
    2.42  {	
    2.43 -	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    2.44 -	EXTRAVERSION=_$KERNEL_VERSION
    2.45 -	_pkg="$WOK/$PACKAGE/$SOURCE"
    2.46 +	EXTRAVERSION=_${kvers}
    2.47  	
    2.48  	mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE \
    2.49  				 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video \
    2.50  				 $fs/usr/share/doc/$PACKAGE 
    2.51  	
    2.52  	# Compress and install module
    2.53 -	lzma e $_pkg/usr/src/nv/nvidia.ko \
    2.54 +	lzma e $src/usr/src/nv/nvidia.ko \
    2.55  			$fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/nvidia.ko.gz
    2.56  	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/nvidia.ko.gz
    2.57  	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/nvidia.ko.gz	
    2.58  	
    2.59 -	cp -a $_pkg/LICENSE $fs/usr/share/licenses/$PACKAGE
    2.60 -	cp -a $_pkg/usr/bin $fs/usr
    2.61 -	cp -a $_pkg/nvidia-installer $fs/usr/bin
    2.62 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib/
    2.63 -	cp -a $_pkg/usr/lib/tls $fs/usr/lib/
    2.64 -	cp -a $_pkg/usr/share/pixmaps $fs/usr/share
    2.65 -	cp -a $_pkg/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/
    2.66 -	cp -a $_pkg/usr/X11R6/lib/* $fs/usr/lib/X11	
    2.67 +	cp -a $src/LICENSE $fs/usr/share/licenses/$PACKAGE
    2.68 +	cp -a $src/usr/bin $fs/usr
    2.69 +	cp -a $src/nvidia-installer $fs/usr/bin
    2.70 +	cp -a $src/usr/lib/*.so* $fs/usr/lib/
    2.71 +	cp -a $src/usr/lib/tls $fs/usr/lib/
    2.72 +	cp -a $src/usr/share/pixmaps $fs/usr/share
    2.73 +	cp -a $src/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/
    2.74 +	cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11	
    2.75  		
    2.76  }
    2.77