[arch-commits] Commit in nvidia-173xx/trunk (4 files)
Pierre Schmitz
pierre at archlinux.org
Sun Mar 1 13:05:07 UTC 2009
Date: Sunday, March 1, 2009 @ 08:05:07
Author: pierre
Revision: 28487
upgpkg: nvidia-173xx 173.14.17-2
Modified:
nvidia-173xx/trunk/PKGBUILD
nvidia-173xx/trunk/nvidia.install
Deleted:
nvidia-173xx/trunk/2.6.28.patch
nvidia-173xx/trunk/NVIDIA_173.14.12_2.6.27.patch
-------------------------------+
2.6.28.patch | 131 ----------------------------------------
NVIDIA_173.14.12_2.6.27.patch | 87 --------------------------
PKGBUILD | 52 ++++++---------
nvidia.install | 21 +-----
4 files changed, 24 insertions(+), 267 deletions(-)
Deleted: 2.6.28.patch
===================================================================
--- 2.6.28.patch 2009-03-01 12:59:50 UTC (rev 28486)
+++ 2.6.28.patch 2009-03-01 13:05:07 UTC (rev 28487)
@@ -1,131 +0,0 @@
-diff -ru usr/src/nv/conftest.sh usr/src/nv.2990799/conftest.sh
---- usr/src/nv/conftest.sh 2008-10-01 15:13:04.000000000 -0700
-+++ usr/src/nv.2990799/conftest.sh 2008-10-27 10:45:57.710065030 -0700
-@@ -67,6 +67,8 @@
- }
-
- build_cflags() {
-+ ARCH=`uname -m | sed -e 's/i.86/i386/'`
-+
- BASE_CFLAGS="-D__KERNEL__ \
- -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
- -nostdinc -isystem $ISYSTEM"
-@@ -80,16 +82,20 @@
- test_xen
-
- if [ "$OUTPUT" != "$SOURCES" ]; then
-- ARCH=`uname -m | sed -e 's/i.86/i386/'`
- MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
- fi
- if [ "$XEN_PRESENT" != "0" ]; then
- MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
- fi
- else
- MACH_CFLAGS="-I$HEADERS/asm/mach-default"
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-+ fi
- if [ "$XEN_PRESENT" != "0" ]; then
- MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
- fi
-@@ -97,6 +103,9 @@
-
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"
-
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-+ fi
- if [ -n "$BUILD_PARAMS" ]; then
- CFLAGS="$CFLAGS -D$BUILD_PARAMS"
- fi
-@@ -897,6 +906,57 @@
- fi
- ;;
-
-+ acpi_evaluate_integer)
-+ #
-+ # Determine if the acpi_evaluate_integer() function is
-+ # present and the type of its 'data' argument.
-+ #
-+
-+ echo "$CONFTEST_PREAMBLE
-+ #include <acpi/acpi_bus.h>
-+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
-+ struct acpi_object_list *l, unsigned long long *d) {
-+ return AE_OK;
-+ }" > conftest$$.c
-+
-+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+ rm -f conftest$$.c
-+
-+ if [ -f conftest$$.o ]; then
-+ rm -f conftest$$.o
-+ echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
-+ echo "typedef unsigned long long nv_acpi_integer_t;" >> conftest.h
-+ return
-+ fi
-+
-+ echo "$CONFTEST_PREAMBLE
-+ #include <acpi/acpi_bus.h>
-+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
-+ struct acpi_object_list *l, unsigned long *d) {
-+ return AE_OK;
-+ }" > conftest$$.c
-+
-+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+ rm -f conftest$$.c
-+
-+ if [ -f conftest$$.o ]; then
-+ rm -f conftest$$.o
-+ echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
-+ echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h
-+ return
-+ else
-+ #
-+ # We can't report a compile test failure here because
-+ # this is a catch-all for both kernels that don't
-+ # have acpi_evaluate_integer() and kernels that have
-+ # broken header files that make it impossible to
-+ # tell if the function is present.
-+ #
-+ echo "#undef NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
-+ echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h
-+ fi
-+ ;;
-+
- esac
- }
-
-diff -ru usr/src/nv/nvacpi.c usr/src/nv.2990799/nvacpi.c
---- usr/src/nv/nvacpi.c 2008-10-01 15:13:04.000000000 -0700
-+++ usr/src/nv.2990799/nvacpi.c 2008-10-27 10:46:05.710520948 -0700
-@@ -158,11 +158,9 @@
-
- os_mem_set((void *)pNvAcpiObject, 0, sizeof(nv_acpi_t));
-
-- // assign driver data structure ptr to this device
-- acpi_driver_data(device) = pNvAcpiObject;
--
-- // store a device reference in our object
-+ device->driver_data = pNvAcpiObject;
- pNvAcpiObject->device = device;
-+
- pNvAcpiObject->sp = sp;
-
- // grab handles to all the important nodes representing devices
---- usr/src/nv/Makefile.nvidia~ 2008-12-27 09:37:36.000000000 +0100
-+++ usr/src/nv/Makefile.nvidia 2008-12-27 09:37:36.000000000 +0100
-@@ -62,7 +62,8 @@
- remap_page_range \
- vmap \
- change_page_attr \
-- i2c_adapter
-+ i2c_adapter \
-+ acpi_evaluate_integer
-
- DEFINES+=$(EXTRA_DEFINES)
-
Deleted: NVIDIA_173.14.12_2.6.27.patch
===================================================================
--- NVIDIA_173.14.12_2.6.27.patch 2009-03-01 12:59:50 UTC (rev 28486)
+++ NVIDIA_173.14.12_2.6.27.patch 2009-03-01 13:05:07 UTC (rev 28487)
@@ -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
---- usr/src/nv/nv.c 2008-07-18 03:42:50.000000000 +0200
-+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/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
---- usr/src/nv/nv-linux.h 2008-07-18 03:42:51.000000000 +0200
-+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h 2008-08-12 00:44:27.000000000 +0200
-@@ -104,7 +104,10 @@
- #endif
-
- #include <linux/spinlock.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#else
- #include <asm/semaphore.h>
-+#endif
- #include <linux/completion.h>
- #include <linux/highmem.h>
-
-@@ -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
---- usr/src/nv/os-interface.c 2008-07-18 03:42:50.000000000 +0200
-+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/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
- }
-
- /*******************************************************************************/
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-01 12:59:50 UTC (rev 28486)
+++ PKGBUILD 2009-03-01 13:05:07 UTC (rev 28487)
@@ -1,46 +1,34 @@
-# $Id: PKGBUILD 8436 2008-08-11 04:51:52Z tpowa $
+# $Id: PKGBUILD 28363 2009-03-01 00:06:27Z pierre $
# Maintainer : Thomas Baechler <thomas at archlinux.org>
pkgname=nvidia-173xx
-pkgver=173.14.12
+pkgver=173.14.17
_kernver='2.6.28-ARCH'
-pkgrel=3
-pkgdesc="NVIDIA legacy drivers for kernel26, 173xx branch"
+pkgrel=2
+pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.nvidia.com/"
depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-173xx-utils')
-conflicts=('nvidia' 'nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy')
+conflicts=('nvidia-96xx' 'nvidia')
license=('custom')
install=nvidia.install
-source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run
- NVIDIA_173.14.12_2.6.27.patch
- 2.6.28.patch)
-md5sums=('76b8eba1b14fc273a1a4044705b0aa56'
- 'cd4a68b5a88be6976b90cd0df6bfe89e'
- '460d52dc0a27d64f881cbacd1e7220b5')
-[ "$CARCH" = "x86_64" ] && md5sums=('8675e4ca65033b343c8c77b2ce82e71d'
- 'cd4a68b5a88be6976b90cd0df6bfe89e'
- '460d52dc0a27d64f881cbacd1e7220b5')
+source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
+md5sums=('9d73573a254ce79f33f461820d83f69e')
+[ "$CARCH" = "x86_64" ] && md5sums=('18ee112f2296f805ace32579a099a685')
-build()
-{
- # Extract
- cd $startdir/src/
- sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
- cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
-
- # Any extra patches are applied in here...
- patch -Np1 -i ../NVIDIA_173.14.12_2.6.27.patch || return 1
- patch -Np0 -i ../2.6.28.patch || return 1
- cd usr/src/nv/
- ln -s Makefile.kbuild Makefile
- make SYSSRC=/lib/modules/${_kernver}/build module || return 1
-
- # install kernel module
- mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
- install -m644 nvidia.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
+build() {
+ cd $srcdir
+ sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
+ cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
- sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
+ cd usr/src/nv/
+ ln -s Makefile.kbuild Makefile
+ make SYSSRC=/lib/modules/${_kernver}/build module || return 1
+
+ mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
+ install -m644 nvidia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
+
+ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install
}
Modified: nvidia.install
===================================================================
--- nvidia.install 2009-03-01 12:59:50 UTC (rev 28486)
+++ nvidia.install 2009-03-01 13:05:07 UTC (rev 28487)
@@ -1,22 +1,9 @@
-# arg 1: the new package version
post_install() {
- KERNEL_VERSION='2.6.28-ARCH'
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
+ KERNEL_VERSION='2.6.28-ARCH'
+ depmod $KERNEL_VERSION
}
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
- rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
-}
-
-# arg 1: the old package version
post_remove() {
- KERNEL_VERSION='2.6.28-ARCH'
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
+ KERNEL_VERSION='2.6.28-ARCH'
+ depmod $KERNEL_VERSION
}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list