[arch-commits] Commit in nvidia/repos (12 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Sun Sep 15 11:27:21 UTC 2013
Date: Sunday, September 15, 2013 @ 13:27:21
Author: tpowa
Revision: 194383
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/PKGBUILD
(from rev 194382, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/nvidia-linux-3.11.patch
(from rev 194382, nvidia/trunk/nvidia-linux-3.11.patch)
nvidia/repos/testing-i686/nvidia.install
(from rev 194382, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 194382, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/nvidia-linux-3.11.patch
(from rev 194382, nvidia/trunk/nvidia-linux-3.11.patch)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 194382, nvidia/trunk/nvidia.install)
Deleted:
nvidia/repos/testing-i686/PKGBUILD
nvidia/repos/testing-i686/nvidia-linux-3.11.patch
nvidia/repos/testing-i686/nvidia.install
nvidia/repos/testing-x86_64/PKGBUILD
nvidia/repos/testing-x86_64/nvidia-linux-3.11.patch
nvidia/repos/testing-x86_64/nvidia.install
----------------------------------------+
/PKGBUILD | 96 +++++++++++++++++++++++++++++++
/nvidia-linux-3.11.patch | 50 ++++++++++++++++
/nvidia.install | 36 +++++++++++
testing-i686/PKGBUILD | 48 ---------------
testing-i686/nvidia-linux-3.11.patch | 25 --------
testing-i686/nvidia.install | 18 -----
testing-x86_64/PKGBUILD | 48 ---------------
testing-x86_64/nvidia-linux-3.11.patch | 25 --------
testing-x86_64/nvidia.install | 18 -----
9 files changed, 182 insertions(+), 182 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-09-15 11:27:06 UTC (rev 194382)
+++ testing-i686/PKGBUILD 2013-09-15 11:27:21 UTC (rev 194383)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=325.15
-_extramodules=extramodules-3.11-ARCH
-pkgrel=6
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.11' 'linux-headers<3.12')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.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+=('528fc538584de6446384b9cec3099d6c')
-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+=('63b2caa0cb128efa1a7808d7bddb2074')
-fi
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- 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
-}
-
-package() {
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-}
Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 194382, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-09-15 11:27:21 UTC (rev 194383)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=325.15
+_extramodules=extramodules-3.11-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.11' 'linux-headers<3.12')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.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+=('528fc538584de6446384b9cec3099d6c')
+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+=('63b2caa0cb128efa1a7808d7bddb2074')
+fi
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ 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
+}
+
+package() {
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+}
Deleted: testing-i686/nvidia-linux-3.11.patch
===================================================================
--- testing-i686/nvidia-linux-3.11.patch 2013-09-15 11:27:06 UTC (rev 194382)
+++ testing-i686/nvidia-linux-3.11.patch 2013-09-15 11:27:21 UTC (rev 194383)
@@ -1,25 +0,0 @@
-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
-
Copied: nvidia/repos/testing-i686/nvidia-linux-3.11.patch (from rev 194382, nvidia/trunk/nvidia-linux-3.11.patch)
===================================================================
--- testing-i686/nvidia-linux-3.11.patch (rev 0)
+++ testing-i686/nvidia-linux-3.11.patch 2013-09-15 11:27:21 UTC (rev 194383)
@@ -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
+
Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install 2013-09-15 11:27:06 UTC (rev 194382)
+++ testing-i686/nvidia.install 2013-09-15 11:27:21 UTC (rev 194383)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.11-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.11-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
- echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
- fi
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.11-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/testing-i686/nvidia.install (from rev 194382, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2013-09-15 11:27:21 UTC (rev 194383)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
+ echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
+ fi
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-09-15 11:27:06 UTC (rev 194382)
+++ testing-x86_64/PKGBUILD 2013-09-15 11:27:21 UTC (rev 194383)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=325.15
-_extramodules=extramodules-3.11-ARCH
-pkgrel=6
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.11' 'linux-headers<3.12')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.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+=('528fc538584de6446384b9cec3099d6c')
-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+=('63b2caa0cb128efa1a7808d7bddb2074')
-fi
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- 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
-}
-
-package() {
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-}
Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 194382, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-09-15 11:27:21 UTC (rev 194383)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=325.15
+_extramodules=extramodules-3.11-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.11' 'linux-headers<3.12')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.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+=('528fc538584de6446384b9cec3099d6c')
+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+=('63b2caa0cb128efa1a7808d7bddb2074')
+fi
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ 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
+}
+
+package() {
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+}
Deleted: testing-x86_64/nvidia-linux-3.11.patch
===================================================================
--- testing-x86_64/nvidia-linux-3.11.patch 2013-09-15 11:27:06 UTC (rev 194382)
+++ testing-x86_64/nvidia-linux-3.11.patch 2013-09-15 11:27:21 UTC (rev 194383)
@@ -1,25 +0,0 @@
-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
-
Copied: nvidia/repos/testing-x86_64/nvidia-linux-3.11.patch (from rev 194382, nvidia/trunk/nvidia-linux-3.11.patch)
===================================================================
--- testing-x86_64/nvidia-linux-3.11.patch (rev 0)
+++ testing-x86_64/nvidia-linux-3.11.patch 2013-09-15 11:27:21 UTC (rev 194383)
@@ -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
+
Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install 2013-09-15 11:27:06 UTC (rev 194382)
+++ testing-x86_64/nvidia.install 2013-09-15 11:27:21 UTC (rev 194383)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.11-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.11-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
- echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
- fi
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.11-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 194382, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2013-09-15 11:27:21 UTC (rev 194383)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
+ echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
+ fi
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
More information about the arch-commits
mailing list