[arch-commits] Commit in nvidia/repos (5 files)

Thomas Bächler thomas at archlinux.org
Tue Nov 8 17:38:58 EST 2011


    Date: Tuesday, November 8, 2011 @ 17:38:57
  Author: thomas
Revision: 142393

db-move: moved nvidia from [testing] to [extra] (i686)

Added:
  nvidia/repos/extra-i686/PKGBUILD
    (from rev 142386, nvidia/repos/testing-i686/PKGBUILD)
  nvidia/repos/extra-i686/nvidia.install
    (from rev 142386, nvidia/repos/testing-i686/nvidia.install)
Deleted:
  nvidia/repos/extra-i686/PKGBUILD
  nvidia/repos/extra-i686/nvidia.install
  nvidia/repos/testing-i686/

----------------+
 PKGBUILD       |   89 +++++++++++++++++++++++++++----------------------------
 nvidia.install |   32 +++++++++----------
 2 files changed, 61 insertions(+), 60 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-08 22:38:56 UTC (rev 142392)
+++ extra-i686/PKGBUILD	2011-11-08 22:38:57 UTC (rev 142393)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=285.05.09
-_kernver='3.0-ARCH'
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.0' 'linux<3.1' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.0' 'linux-headers<3.1')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('2d469a90abef50320f548cfa8085e3a0')
-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=('2f4a0e78f5560c07220b7ed6fc1e27aa')
-fi
-
-build() {
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    make SYSSRC=/lib/modules/"${_kernver}/build" module
-}
-
-package() {
-    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
-        "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
-    install -d -m755 "${pkgdir}/etc/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
-    sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "${startdir}/nvidia.install"
-    gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
-}

Copied: nvidia/repos/extra-i686/PKGBUILD (from rev 142386, nvidia/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-08 22:38:57 UTC (rev 142393)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=285.05.09
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux."
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.1' 'linux<3.2' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.1' 'linux-headers<3.2')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+if [ "$CARCH" = "i686" ]; then
+    _arch='x86'
+    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums=('2d469a90abef50320f548cfa8085e3a0')
+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=('2f4a0e78f5560c07220b7ed6fc1e27aa')
+fi
+
+build() {
+    cd "${srcdir}"
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}/kernel"
+    make SYSSRC=/lib/modules/"${_kernver}/build" module
+}
+
+package() {
+    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+        "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
+    install -d -m755 "${pkgdir}/etc/modprobe.d"
+    echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+    gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
+}

Deleted: extra-i686/nvidia.install
===================================================================
--- extra-i686/nvidia.install	2011-11-08 22:38:56 UTC (rev 142392)
+++ extra-i686/nvidia.install	2011-11-08 22:38:57 UTC (rev 142393)
@@ -1,16 +0,0 @@
-post_install() {
-    KERNEL_VERSION='3.0-ARCH'
-    depmod $KERNEL_VERSION
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    KERNEL_VERSION='3.0-ARCH'
-    depmod $KERNEL_VERSION
-    rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
-}
-
-post_remove() {
-    KERNEL_VERSION='3.0-ARCH'
-    depmod $KERNEL_VERSION
-}

Copied: nvidia/repos/extra-i686/nvidia.install (from rev 142386, nvidia/repos/testing-i686/nvidia.install)
===================================================================
--- extra-i686/nvidia.install	                        (rev 0)
+++ extra-i686/nvidia.install	2011-11-08 22:38:57 UTC (rev 142393)
@@ -0,0 +1,16 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}



More information about the arch-commits mailing list