From 1edfcecbd54c9413f1b1e94132e393f16297d301 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Wed, 12 May 2010 17:45:43 +0200 Subject: system/nvidia-legacy96-kernel: Updated for version 96.43.11 --- system/nvidia-legacy96-kernel/doinst.sh | 3 +- .../nvidia-96.43.07-2.6.27.patch | 87 ---------------------- .../nvidia-legacy96-kernel.SlackBuild | 12 +-- .../nvidia-legacy96-kernel.info | 8 +- 4 files changed, 9 insertions(+), 101 deletions(-) delete mode 100644 system/nvidia-legacy96-kernel/nvidia-96.43.07-2.6.27.patch (limited to 'system/nvidia-legacy96-kernel') diff --git a/system/nvidia-legacy96-kernel/doinst.sh b/system/nvidia-legacy96-kernel/doinst.sh index 79891f9acd..57abf59843 100644 --- a/system/nvidia-legacy96-kernel/doinst.sh +++ b/system/nvidia-legacy96-kernel/doinst.sh @@ -1,3 +1,2 @@ - -chroot . /sbin/depmod -a +chroot . /sbin/depmod -ae @KERNEL@ diff --git a/system/nvidia-legacy96-kernel/nvidia-96.43.07-2.6.27.patch b/system/nvidia-legacy96-kernel/nvidia-96.43.07-2.6.27.patch deleted file mode 100644 index 6f2b747829..0000000000 --- a/system/nvidia-legacy96-kernel/nvidia-96.43.07-2.6.27.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv.c ---- nv.c 2008-07-18 03:42:50.000000000 +0200 -+++ nv.c 2008-08-12 00:35:45.000000000 +0200 -@@ -1296,14 +1296,22 @@ - if (get_cpu() == cpu) - __nv_setup_pat_entries(NULL); - else -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ smp_call_function(__nv_setup_pat_entries, hcpu, 1); -+ #else - smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1); -+ #endif - put_cpu(); - break; - case CPU_DOWN_PREPARE: - if (get_cpu() == cpu) - __nv_restore_pat_entries(NULL); - else -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ smp_call_function(__nv_restore_pat_entries, hcpu, 1); -+ #else - smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1); -+ #endif - put_cpu(); - break; - } -diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h ---- nv-linux.h 2008-07-18 03:42:51.000000000 +0200 -+++ nv-linux.h 2008-08-12 00:44:27.000000000 +0200 -@@ -104,7 +104,10 @@ - #endif - - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+#else - #include -+#endif - #include - #include - -@@ -665,13 +668,21 @@ - #if defined(preempt_disable) - preempt_disable(); - #endif -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ ret = smp_call_function(func, info, 1); -+ #else - ret = smp_call_function(func, info, 1, 1); -+ #endif - func(info); - #if defined(preempt_enable) - preempt_enable(); - #endif - #else -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ ret = on_each_cpu(func, info, 1); -+ #else - ret = on_each_cpu(func, info, 1, 1); -+ #endif - #endif - return ret; - } -diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/os-interface.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/os-interface.c ---- os-interface.c 2008-07-18 03:42:50.000000000 +0200 -+++ os-interface.c 2008-08-12 00:48:07.000000000 +0200 -@@ -48,7 +48,11 @@ - #endif - local_bh_disable(); - atomic_set(&os_smp_barrier, 1); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ ret = smp_call_function(ipi_handler, NULL, 0); -+ #else - ret = smp_call_function(ipi_handler, NULL, 1, 0); -+ #endif - #endif - return (ret == 0) ? RM_OK : RM_ERROR; - } -@@ -704,7 +708,9 @@ - U032 sig - ) - { -+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26) - return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK; -+ #endif - } - - /************************************************************************** \ No newline at end of file diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild index 1f0edd5bdf..174fe19c33 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-2008 Heinz Wiesinger +# Copyright 2007-2009 Heinz Wiesinger # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +27,8 @@ KERNELVERSION=${KERNELVERSION:-$(uname -r)} KERNELPATH=${KERNELPATH:-/lib/modules/${KERNELVERSION}/build} -VERSION=96.43.07 -NAME=NVIDIA-Linux-x86-$VERSION-pkg1 +VERSION=96.43.11 +NAME=NVIDIA-Linux-x86-$VERSION-pkg0 PKG_NAME=nvidia-legacy96-kernel PKG_VERS=${VERSION}_$(echo $KERNELVERSION | tr - _) @@ -52,10 +52,6 @@ chmod -R u+w,go+r-w,a-s . cd usr/src/nv/ || exit 1 -if [ "${KERNELVERSION:0:6}" = "2.6.27" ]; then - patch -p0 -i $CWD/nvidia-$VERSION-2.6.27.patch -fi - make SYSSRC=$KERNELPATH module || exit 1 # It seems better as DESTDIR doesn't work here, to install the module manually. @@ -70,7 +66,7 @@ cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PKG_NAME-$PKG_VERS/$PKG_NAME.Slack 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/$PKG_NAME-$PKG_VERS-$ARCH-$BUILD$TAG.tgz diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info index 75b34dbabb..a8b6bf6ffd 100644 --- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info +++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info @@ -1,8 +1,8 @@ PRGNAM="nvidia-legacy96-kernel" -VERSION="96.43.07" +VERSION="96.43.11" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/96.43.07/NVIDIA-Linux-x86-96.43.07-pkg1.run" -MD5SUM="bce9f250b21cc024d8fcebc28ba06970" +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" EMAIL="pprkut@liwjatan.at" -APPROVED="dsomero" \ No newline at end of file +APPROVED="rworkman" -- cgit v1.2.3-80-g2a13