From 6cd331857ff82828d6565d8f90c7128aaa1690e5 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Thu, 13 May 2010 00:41:12 +0200 Subject: [PATCH] system/nvidia-legacy96-kernel: Updated for version 96.43.14 --- system/nvidia-legacy96-kernel/doinst.sh | 2 +- .../nvidia-legacy96-kernel.SlackBuild | 46 +++++++++++-------- .../nvidia-legacy96-kernel.info | 12 +++-- system/nvidia-legacy96-kernel/slack-desc | 8 ++-- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/system/nvidia-legacy96-kernel/doinst.sh b/system/nvidia-legacy96-kernel/doinst.sh index 57abf59843..bafd9c3607 100644 --- a/system/nvidia-legacy96-kernel/doinst.sh +++ b/system/nvidia-legacy96-kernel/doinst.sh @@ -1,2 +1,2 @@ -chroot . /sbin/depmod -ae @KERNEL@ +chroot . /sbin/depmod -ae @KERNEL@ diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild index 174fe19c33..a91f1cd3b0 100644 --- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild +++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nvidia-legacy96-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 @@ -24,29 +24,38 @@ # Thanks to Robby Workman for suggestions to improve this script. -KERNELVERSION=${KERNELVERSION:-$(uname -r)} -KERNELPATH=${KERNELPATH:-/lib/modules/${KERNELVERSION}/build} +KERNEL=${KERNEL:-$(uname -r)} +KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build} -VERSION=96.43.11 -NAME=NVIDIA-Linux-x86-$VERSION-pkg0 -PKG_NAME=nvidia-legacy96-kernel -PKG_VERS=${VERSION}_$(echo $KERNELVERSION | tr - _) +VERSION=96.43.14 +PRGNAM=nvidia-legacy96-kernel +PKGVER=${VERSION}_$(echo $KERNEL | tr - _) 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 + +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 mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 -rm -rf $NAME -sh $CWD/$NAME.run --extract-only || exit 1 -cd $NAME || exit 1 +rm -rf $SRCNAM +sh $CWD/$SRCNAM.run --extract-only || exit 1 +cd $SRCNAM || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -54,19 +63,16 @@ cd usr/src/nv/ || 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/lib/modules/$KERNELVERSION/kernel/drivers/video -install -m 0664 nvidia.ko $PKG/lib/modules/$KERNELVERSION/kernel/drivers/video/ - -mkdir -p $PKG/usr/doc/$PKG_NAME-$PKG_VERS -cp -a README $PKG/usr/doc/$PKG_NAME-$PKG_VERS -cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PKG_NAME-$PKG_VERS/$PKG_NAME.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER +cp -a README $PKG/usr/doc/$PRGNAM-$PKGVER +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKG_NAME-$PKG_VERS-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info index a8b6bf6ffd..737bb32bcb 100644 --- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info +++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info @@ -1,8 +1,10 @@ PRGNAM="nvidia-legacy96-kernel" -VERSION="96.43.11" +VERSION="96.43.14" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/96.43.11/NVIDIA-Linux-x86-96.43.11-pkg0.run" -MD5SUM="bf2661f00759f78cbad9f72eeecdc676" -MAINTAINER="ppr:kut" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/96.43.14/NVIDIA-Linux-x86-96.43.14-pkg0.run" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.14/NVIDIA-Linux-x86_64-96.43.14-pkg0.run" +MD5SUM="4c1524c5f88e684bb1045ca759c11526" +MD5SUM_x86_64="6924d94b07163d7d71b44f53471dfb83" +MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="rworkman" +APPROVED="Erik Hanson" diff --git a/system/nvidia-legacy96-kernel/slack-desc b/system/nvidia-legacy96-kernel/slack-desc index 19582662cb..b0554d6a8d 100644 --- a/system/nvidia-legacy96-kernel/slack-desc +++ b/system/nvidia-legacy96-kernel/slack-desc @@ -5,11 +5,11 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler---------------------------------------| -nvidia-legacy96-kernel: nvidia-legacy96-kernel (nvidia-driver Kernel Interface) + |-----handy-ruler------------------------------------------------------| +nvidia-legacy96-kernel: nvidia-legacy96-kernel (nvidia-legacy96-driver Kernel Interface) +nvidia-legacy96-kernel: +nvidia-legacy96-kernel: This is the kernel module needed by the binary nvidia-driver. nvidia-legacy96-kernel: -nvidia-legacy96-kernel: This is the kernel module needed by the binary -nvidia-legacy96-kernel: nvidia-driver. nvidia-legacy96-kernel: nvidia-legacy96-kernel: nvidia-legacy96-kernel: