# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1229010001 0
# Node ID e2718e4cba26dd465836ec0b38d58026eae5b523
# Parent  f4d16010477f7bc467781d6f5f6e003f25535136
nvidia*: ash compatible, no hardcoded kernel version

diff -r f4d16010477f -r e2718e4cba26 nvidia-glx/receipt
--- a/nvidia-glx/receipt	Thu Dec 11 15:14:24 2008 +0100
+++ b/nvidia-glx/receipt	Thu Dec 11 15:40:01 2008 +0000
@@ -13,13 +13,19 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-  mkdir -p $fs/usr/{bin,lib/tls}
-  mkdir -p $fs/usr/lib/X11/modules/{extensions,drivers}
+  mkdir -p $fs/usr/bin $fs/usr/lib/tls
+  mkdir -p $fs/usr/lib/X11/modules/extensions $fs/usr/lib/X11/modules/drivers
   
-  install -m755 $src/usr/lib/lib{GL,GLcore,nvidia-cfg,nvidia-tls}.so.$VERSION $fs/usr/lib
-  install -m755 $src/usr/{lib/tls,X11R6/lib}/lib*.so.$VERSION $fs/usr/lib/tls
-  install -m755 $src/usr/X11R6/lib/modules/drivers/nvidia_drv.so $fs/usr/lib/X11/modules/drivers
-  install -m755 $src/usr/X11R6/lib/modules/extensions/libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions
+  install -m755 $src/usr/lib/libGL.so.$VERSION \
+                $src/usr/lib/libGLcore.so.$VERSION \
+                $src/usr/lib/libnvidia-cfg.so.$VERSION \
+                $src/usr/lib/libnvidia-tls.so.$VERSION $fs/usr/lib
+  install -m755 $src/usr/lib/tls/lib*.so.$VERSION \
+                $src/usr/X11R6/lib/lib*.so.$VERSION $fs/usr/lib/tls
+  install -m755 $src/usr/X11R6/lib/modules/drivers/nvidia_drv.so \
+                $fs/usr/lib/X11/modules/drivers
+  install -m755 $src/usr/X11R6/lib/modules/extensions/libglx.so.$VERSION \
+                $fs/usr/lib/X11/modules/extensions
   
   install -m755 $src/usr/bin/nvidia-xconfig $fs/usr/bin/
 
diff -r f4d16010477f -r e2718e4cba26 nvidia-settings/receipt
--- a/nvidia-settings/receipt	Thu Dec 11 15:14:24 2008 +0100
+++ b/nvidia-settings/receipt	Thu Dec 11 15:40:01 2008 +0000
@@ -12,10 +12,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-  mkdir -p $fs/usr/{bin,share/pixmaps,share/applications}
+  mkdir -p $fs/usr/bin $fs/usr/share/pixmaps $fs/usr/share/applications
   install -m755 $src/usr/bin/nvidia-settings $fs/usr/bin/
-  install -m644 $src/usr/share/pixmaps/nvidia-settings.png $fs/usr/share/pixmaps/
-  install -m644 $src/usr/share/applications/nvidia-settings.desktop $fs/usr/share/applications/
-  sed -i 's:__UTILS_PATH__:/usr/bin:' $fs/usr/share/applications/nvidia-settings.desktop
-  sed -i 's:__PIXMAP_PATH__:/usr/share/pixmaps:' $fs/usr/share/applications/nvidia-settings.desktop
+  install -m644 $src/usr/share/pixmaps/nvidia-settings.png \
+                $fs/usr/share/pixmaps/
+  install -m644 $src/usr/share/applications/nvidia-settings.desktop \
+                $fs/usr/share/applications/
+  sed -i 's:__UTILS_PATH__:/usr/bin:' \
+                $fs/usr/share/applications/nvidia-settings.desktop
+  sed -i 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+                $fs/usr/share/applications/nvidia-settings.desktop
 }
diff -r f4d16010477f -r e2718e4cba26 nvidia/receipt
--- a/nvidia/receipt	Thu Dec 11 15:14:24 2008 +0100
+++ b/nvidia/receipt	Thu Dec 11 15:40:01 2008 +0000
@@ -2,7 +2,6 @@
 
 PACKAGE="nvidia"
 VERSION="177.82"
-KERNEL_VERSION="2.6.25.5-slitaz"
 CATEGORY="non-free"
 SHORT_DESC="NVIDIA X.org kernel driver."
 MAINTAINER="b1+slitaz@nagel.org"
@@ -41,6 +40,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
+  KERNEL_VERSION=$(grep "kernel version" ../linux/linux-*/.config)
+  KERNEL_VERSION=${KERNEL_VERSION##* }-slitaz
   mkdir -p $fs/lib/modules/$KERNEL_VERSION/kernel/drivers/video
   install -m644 $src/usr/src/nv/nvidia.ko $fs/lib/modules/$KERNEL_VERSION/kernel/drivers/video/
   mkdir -p $fs/usr/share/doc/nvidia
@@ -50,10 +51,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-  depmod -a -b "$1/" $KERNEL_VERSION
+  depmod -a -b "$1/" ${EXTRAVERSION#_}-slitaz
 }
 
 post_remove()
 {
-  depmod -a $KERNEL_VERSION
+  depmod -a ${EXTRAVERSION#_}-slitaz
 }