4 files changed, 43 insertions, 10 deletions
diff --git a/system/nvidia-kernel/BLACKLIST-nouveau.conf b/system/nvidia-kernel/BLACKLIST-nouveau.conf
new file mode 100644
index 0000000000000..c7f1a88a78e66
--- /dev/null
+++ b/system/nvidia-kernel/BLACKLIST-nouveau.conf
@@ -0,0 +1,2 @@
+blacklist nouveau
+
diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index fa805381cfc9a..4705cbbe0525d 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -3,4 +3,4 @@ You also need the nvidia-driver package from SlackBuilds.org.
 
 To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
-    KERNEL=2.6.33.7 ./nvidia-kernel.SlackBuild
+    KERNEL=2.6.38.4 ./nvidia-kernel.SlackBuild
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index ed556ddd90c9e..d3991c97b24d4 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -23,9 +23,16 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Thanks to Robby Workman for suggestions to improve this script.
+#
+# ChangeLog
+# ------------------------------------------------------------------------------
+# 1.0	20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
+# 1.1	10-APR-2011	updated to new version, testing 13.37rc4.6692
+# 1.2   27-MAY-2011	new version, blacklist nouveau, fix ups, tested 13.37-stable
+#
 
 PRGNAM=nvidia-kernel
-VERSION=260.19.29
+VERSION=270.41.19
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,7 +57,8 @@ elif [ "$ARCH" = "i686" ]; then
   SRCSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x86_64"
-  SRCSUFFIX="-no-compat32"
+  SRCSUFFIX=${SRCSUFFIX:-}
+# pass SRCSUFFIX="-no-compat32" if you d/l that version.
 fi
 
 unset ARCH
@@ -76,7 +84,28 @@ cd kernel || exit 1
 make SYSSRC=$KERNELPATH module || exit 1
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
-install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0644 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+
+# Blacklist the nouveau driver (ok, I know this will annoy some using 
+# nvidia-switch and you need to reboot for this to work)...
+mkdir -p $PKG/etc/modprobe.d
+cat <<EOF > $PKG/etc/modprobe.d/blacklist-nouveau.conf
+blacklist nouveau
+EOF
+
+#... AND make sure the nvidia driver is specified to
+# automagically load the correct driver, since I always forget. If you
+# create a proper full xorg.conf, then this isn't needed.
+mkdir -p $PKG/etc/X11/xorg.conf.d
+cat << EOF > $PKG/etc/X11/xorg.conf.d/device.conf
+Section "Device"
+    Identifier  "Device0"
+    Driver  "nvidia"
+    VendorName "Nvidia Corporation"
+    BoardName ""
+    Option  "CoolBits"  "1"
+EndSection
+EOF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
 cp -a README.template $PKG/usr/doc/$PRGNAM-$PKGVER
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index fe66abd7d8a3e..a0a41c4f3e5ff 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,12 @@
 PRGNAM="nvidia-kernel"
-VERSION="260.19.29"
+VERSION="270.41.19"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/260.19.29/NVIDIA-Linux-x86-260.19.29.run"
-MD5SUM="e982a05a85c68130acfe1d48086250e3"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/260.19.29/NVIDIA-Linux-x86_64-260.19.29-no-compat32.run"
-MD5SUM_x86_64="0583668d86f7318d99def3ed3e1cc4bc"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/270.41.19/NVIDIA-Linux-x86-270.41.19.run"
+MD5SUM="c167e32702f56599bd600add97943312"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19-no-compat32.run \
+                 ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19.run"
+MD5SUM_x86_64="cb518bdd70f356425b8c4a5a48c0ad9c \
+               b84143ecb5c0511c5ef9e53e732d9136"
 MAINTAINER="Edward Koenig"
 EMAIL="kingbeowulf@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"