From ffcee298ec8d1b0206b51b339c0d569a6ce73473 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 14 Mar 2016 13:24:50 +0000 Subject: Keep the 352.79 as close as possible to the original --- nvidia-kernel/build/nvidia-kernel.SlackBuild | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nvidia-kernel/build/nvidia-kernel.SlackBuild b/nvidia-kernel/build/nvidia-kernel.SlackBuild index 41e7ecd2..239c9c93 100755 --- a/nvidia-kernel/build/nvidia-kernel.SlackBuild +++ b/nvidia-kernel/build/nvidia-kernel.SlackBuild @@ -29,12 +29,14 @@ PRGNAM=nvidia-kernel VERSION=${VERSION:-352.79} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-alien} KERNEL=${KERNEL:-$(uname -r)} KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build} +set -e + PKGVER=${VERSION}_$(echo $KERNEL | tr - _) if [ -z "$ARCH" ]; then @@ -77,15 +79,20 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Nvidia removed uvm module from 32-bit (cd kernel || exit 1 make SYSSRC=$KERNELPATH module || exit 1 - cd uvm - make SYSSRC=$KERNELPATH module || exit 1 + if [ "$ARCH" = "x86_64" ]; then + cd uvm + make SYSSRC=$KERNELPATH module || exit 1 + fi ) mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video install -m 0664 kernel/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ -install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ +if [ "$ARCH" = "x86_64" ]; then + install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ +fi # Make sure the X is specified to automagically load the # correct driver, since I always forget. You can remove -- cgit v1.2.3-65-gdbad