[arch-commits] Commit in nvidia-304xx-lts/trunk (3 files)

Bartłomiej Piotrowski bpiotrowski at nymeria.archlinux.org
Tue Sep 17 09:08:27 UTC 2013


    Date: Tuesday, September 17, 2013 @ 11:08:26
  Author: bpiotrowski
Revision: 194521

upgpkg: nvidia-304xx-lts 304.108-2

- rebuild against linux-lts 3.10.12

Added:
  nvidia-304xx-lts/trunk/nvidia-linux-3.11.patch
Modified:
  nvidia-304xx-lts/trunk/PKGBUILD
  nvidia-304xx-lts/trunk/nvidia-304xx-lts.install

--------------------------+
 PKGBUILD                 |   20 ++++++++++++--------
 nvidia-304xx-lts.install |    6 +++---
 nvidia-linux-3.11.patch  |   25 +++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-17 08:54:51 UTC (rev 194520)
+++ PKGBUILD	2013-09-17 09:08:26 UTC (rev 194521)
@@ -3,28 +3,31 @@
 
 pkgname=nvidia-304xx-lts
 pkgver=304.108
-_extramodules=extramodules-3.0-lts
-pkgrel=1
+_extramodules=extramodules-3.10-lts
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-lts>=3.0.0' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-lts-headers>=3.0.0')
+depends=('linux-lts>=3.10.0' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-lts-headers>=3.10.0')
 conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts')
 provides=('nvidia-304xx')
 license=('custom')
 install=nvidia-304xx-lts.install
 options=(!strip)
+source=('nvidia-linux-3.11.patch')
+md5sums=('5c962760de069ed4ad34e64d5988686a')
+
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('ef453e32515c2176c67ebd95c770dc0e')
+    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums+=('ef453e32515c2176c67ebd95c770dc0e')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
    _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('4e0e54de6735023f44c858a3006b3e18')
+    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums+=('4e0e54de6735023f44c858a3006b3e18')
 fi
 
 build() {
@@ -32,6 +35,7 @@
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}/kernel"
+    patch -Np2 -i ${srcdir}/nvidia-linux-3.11.patch
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 

Modified: nvidia-304xx-lts.install
===================================================================
--- nvidia-304xx-lts.install	2013-09-17 08:54:51 UTC (rev 194520)
+++ nvidia-304xx-lts.install	2013-09-17 09:08:26 UTC (rev 194521)
@@ -1,15 +1,15 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.0-lts'
+    EXTRAMODULES='extramodules-3.10-lts'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.0-lts'
+    EXTRAMODULES='extramodules-3.10-lts'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.0-lts'
+    EXTRAMODULES='extramodules-3.10-lts'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }

Added: nvidia-linux-3.11.patch
===================================================================
--- nvidia-linux-3.11.patch	                        (rev 0)
+++ nvidia-linux-3.11.patch	2013-09-17 09:08:26 UTC (rev 194521)
@@ -0,0 +1,25 @@
+From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001
+From: Lukas Elsner <open at mindrunner.de>
+Date: Wed, 17 Jul 2013 01:16:04 +0200
+Subject: [PATCH] replace num_physpages with totalram_pages
+
+---
+ kernel/nv-linux.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index 4e5ed89..46c51ec 100644
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
+ #endif
+ 
+ #if !defined(NV_VMWARE)
+-#define NV_NUM_PHYSPAGES                num_physpages
++#define NV_NUM_PHYSPAGES                totalram_pages
+ #define NV_GET_CURRENT_PROCESS()        current->tgid
+ #define NV_IN_ATOMIC()                  in_atomic()
+ #define NV_LOCAL_BH_DISABLE()           local_bh_disable()
+-- 
+1.8.3.2
+




More information about the arch-commits mailing list