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

Ionut Biru ibiru at archlinux.org
Fri Nov 16 21:41:42 UTC 2012


    Date: Friday, November 16, 2012 @ 16:41:41
  Author: ibiru
Revision: 171241

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nvidia/repos/extra-i686/PKGBUILD
    (from rev 171240, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-i686/nvidia.install
    (from rev 171240, nvidia/trunk/nvidia.install)
  nvidia/repos/extra-x86_64/PKGBUILD
    (from rev 171240, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/nvidia.install
    (from rev 171240, nvidia/trunk/nvidia.install)
Deleted:
  nvidia/repos/extra-i686/PKGBUILD
  nvidia/repos/extra-i686/nvidia.install
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/nvidia.install

-----------------------------+
 extra-i686/PKGBUILD         |   90 +++++++++++++++++++++---------------------
 extra-i686/nvidia.install   |   33 ++++++++-------
 extra-x86_64/PKGBUILD       |   90 +++++++++++++++++++++---------------------
 extra-x86_64/nvidia.install |   33 ++++++++-------
 4 files changed, 126 insertions(+), 120 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-11-16 21:41:01 UTC (rev 171240)
+++ extra-i686/PKGBUILD	2012-11-16 21:41:41 UTC (rev 171241)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=310.19
-_extramodules=extramodules-3.6-ARCH
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
-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=('2adbdd38540b3a8955714760e05f575d')
-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=('0ba08d32852e442ebba5ba22c7abed36')
-fi
-
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    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/extra-i686/PKGBUILD (from rev 171240, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-11-16 21:41:41 UTC (rev 171241)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=310.19
+_extramodules=extramodules-3.6-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux."
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
+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=('2adbdd38540b3a8955714760e05f575d')
+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=('0ba08d32852e442ebba5ba22c7abed36')
+fi
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${srcdir}"
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}/kernel"
+    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: extra-i686/nvidia.install
===================================================================
--- extra-i686/nvidia.install	2012-11-16 21:41:01 UTC (rev 171240)
+++ extra-i686/nvidia.install	2012-11-16 21:41:41 UTC (rev 171241)
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/extra-i686/nvidia.install (from rev 171240, nvidia/trunk/nvidia.install)
===================================================================
--- extra-i686/nvidia.install	                        (rev 0)
+++ extra-i686/nvidia.install	2012-11-16 21:41:41 UTC (rev 171241)
@@ -0,0 +1,18 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.6-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.6-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.6-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-11-16 21:41:01 UTC (rev 171240)
+++ extra-x86_64/PKGBUILD	2012-11-16 21:41:41 UTC (rev 171241)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=310.19
-_extramodules=extramodules-3.6-ARCH
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
-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=('2adbdd38540b3a8955714760e05f575d')
-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=('0ba08d32852e442ebba5ba22c7abed36')
-fi
-
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    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/extra-x86_64/PKGBUILD (from rev 171240, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-11-16 21:41:41 UTC (rev 171241)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=310.19
+_extramodules=extramodules-3.6-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux."
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
+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=('2adbdd38540b3a8955714760e05f575d')
+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=('0ba08d32852e442ebba5ba22c7abed36')
+fi
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${srcdir}"
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}/kernel"
+    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: extra-x86_64/nvidia.install
===================================================================
--- extra-x86_64/nvidia.install	2012-11-16 21:41:01 UTC (rev 171240)
+++ extra-x86_64/nvidia.install	2012-11-16 21:41:41 UTC (rev 171241)
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/extra-x86_64/nvidia.install (from rev 171240, nvidia/trunk/nvidia.install)
===================================================================
--- extra-x86_64/nvidia.install	                        (rev 0)
+++ extra-x86_64/nvidia.install	2012-11-16 21:41:41 UTC (rev 171241)
@@ -0,0 +1,18 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.6-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.6-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.6-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}




More information about the arch-commits mailing list