diff --git a/system/nvidia-kernel/doinst.sh b/system/nvidia-kernel/doinst.sh index 79891f9acd..dcfb80855f 100644 --- a/system/nvidia-kernel/doinst.sh +++ b/system/nvidia-kernel/doinst.sh @@ -1,3 +1,3 @@ -chroot . /sbin/depmod -a +chroot . /sbin/depmod -a @KERNEL@ 2>/dev/null diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild index 2d6a1b0709..9f55b3fae8 100644 --- a/system/nvidia-kernel/nvidia-kernel.SlackBuild +++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nvidia-kernel -# Copyright 2007-2009 Heinz Wiesinger +# Copyright 2007-2009 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +27,7 @@ KERNEL=${KERNEL:-$(uname -r)} KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build} -VERSION=180.29 -SRCNAM=NVIDIA-Linux-x86-$VERSION-pkg0 +VERSION=190.42 PRGNAM=nvidia-kernel PKGVER=${VERSION}_$(echo $KERNEL | tr - _) @@ -36,9 +35,21 @@ ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +if [ "$ARCH" = "i486" ]; then + TARGET="x86" +elif [ "$ARCH" = "i686" ]; then + TARGET="x86" +elif [ "$ARCH" = "x86_64" ]; then + TARGET="x86_64" +fi + +unset ARCH + +SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-pkg0 + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=${PKG:-$TMP/package-$PKG_NAME} +PKG=${PKG:-$TMP/package-$PRGNAM} OUTPUT=${OUTPUT:-/tmp} rm -rf $PKG @@ -66,7 +77,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh +sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info index 784cacb33c..1ca16037ef 100644 --- a/system/nvidia-kernel/nvidia-kernel.info +++ b/system/nvidia-kernel/nvidia-kernel.info @@ -1,8 +1,10 @@ PRGNAM="nvidia-kernel" -VERSION="180.29" +VERSION="190.42" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/180.29/NVIDIA-Linux-x86-180.29-pkg0.run" -MD5SUM="db9aa3683988b7b0872abae7182f5bc5" -MAINTAINER="ppr:kut" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/190.42/NVIDIA-Linux-x86-190.42-pkg0.run" +MD5SUM="f94806feee87de756d14fe3e9bcaf05a" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/190.42/NVIDIA-Linux-x86_64-190.42-pkg0.run" +MD5SUM_x86_64="ae431ff849ec01446e6724f9fcfe3bb4" +MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="dsomero" +APPROVED="rworkman"