summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/nvidia-kernel/README4
-rw-r--r--system/nvidia-kernel/nvidia-kernel.SlackBuild16
-rw-r--r--system/nvidia-kernel/nvidia-kernel.info12
3 files changed, 17 insertions, 15 deletions
diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index 94ca6d970d..fa805381cf 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -1,2 +1,6 @@
This is the kernel-module needed by the proprietary binary nvidia driver.
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
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index c3e18b93c5..86de70674c 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -25,7 +25,7 @@
# Thanks to Robby Workman for suggestions to improve this script.
PRGNAM=nvidia-kernel
-VERSION=195.36.15
+VERSION=256.44
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -34,27 +34,28 @@ KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
if [ "$ARCH" = "i486" ]; then
TARGET="x86"
+ SRCSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
TARGET="x86"
+ SRCSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
TARGET="x86_64"
+ SRCSUFFIX="-no-compat32"
fi
unset ARCH
-SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-pkg0
+SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}${SRCSUFFIX}
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
@@ -70,18 +71,15 @@ cd $SRCNAM || exit 1
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-cd usr/src/nv/ || exit 1
+cd kernel || exit 1
make SYSSRC=$KERNELPATH module || exit 1
-# It seems better as DESTDIR doesn't work here, to install the module manually.
-#make SYSSRC=$KERNELPATH install DESTDIR=$PKG || exit 1
-
mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
-cp -a README $PKG/usr/doc/$PRGNAM-$PKGVER
+cp -a README.template $PKG/usr/doc/$PRGNAM-$PKGVER
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index a0e571d5bd..f73e197081 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
PRGNAM="nvidia-kernel"
-VERSION="195.36.15"
+VERSION="256.44"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/195.36.15/NVIDIA-Linux-x86-195.36.15-pkg0.run"
-MD5SUM="b09b45113585524b08b3b2acfdf4a290"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.15/NVIDIA-Linux-x86_64-195.36.15-pkg0.run"
-MD5SUM_x86_64="82ff23e6d02b9f208c618ec17c60ca29"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/256.44/NVIDIA-Linux-x86-256.44.run"
+MD5SUM="cb61b75a305e78291db313dae39c625b"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/256.44/NVIDIA-Linux-x86_64-256.44-no-compat32.run"
+MD5SUM_x86_64="19fdd60520df7f50ae7dbb24e473872b"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"
-APPROVED="rworkman"
+APPROVED="dsomero"