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

Ionuț Mircea Bîru ioni at nymeria.archlinux.org
Tue Mar 5 18:18:27 UTC 2013


    Date: Tuesday, March 5, 2013 @ 19:18:27
  Author: ioni
Revision: 179505

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

Added:
  nvidia/repos/extra-i686/PKGBUILD
    (from rev 179504, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-i686/nvidia.install
    (from rev 179504, nvidia/trunk/nvidia.install)
  nvidia/repos/extra-x86_64/PKGBUILD
    (from rev 179504, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/nvidia.install
    (from rev 179504, nvidia/trunk/nvidia.install)
Deleted:
  nvidia/repos/extra-i686/PKGBUILD
  nvidia/repos/extra-i686/linux-3.7.patch
  nvidia/repos/extra-i686/nvidia.install
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/linux-3.7.patch
  nvidia/repos/extra-x86_64/nvidia.install

------------------------------+
 extra-i686/PKGBUILD          |   93 +++++++++++++++++++----------------------
 extra-i686/linux-3.7.patch   |   24 ----------
 extra-i686/nvidia.install    |   36 +++++++--------
 extra-x86_64/PKGBUILD        |   93 +++++++++++++++++++----------------------
 extra-x86_64/linux-3.7.patch |   24 ----------
 extra-x86_64/nvidia.install  |   36 +++++++--------
 6 files changed, 126 insertions(+), 180 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-03-05 18:17:31 UTC (rev 179504)
+++ extra-i686/PKGBUILD	2013-03-05 18:18:27 UTC (rev 179505)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=313.18
-_extramodules=extramodules-3.7-ARCH
-pkgrel=3
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-source=('linux-3.7.patch')
-md5sums=('7c684fab691b15d55a79fd8f9b1a224d')
-
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums+=('780c37c28a6e06e9571cafe348b7da64')
-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+=('fa17a260793a38b4b8ae367db2e03b39')
-fi
-
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    patch -Np3 -i "${srcdir}"/linux-3.7.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/extra-i686/PKGBUILD (from rev 179504, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-03-05 18:18:27 UTC (rev 179505)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=313.26
+_extramodules=extramodules-3.7-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux."
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
+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=('3c2f5138d0fec58b27e26c5b37d845b8')
+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=('2d35124fa5a4b009f170fe893b5d07e3')
+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/linux-3.7.patch
===================================================================
--- extra-i686/linux-3.7.patch	2013-03-05 18:17:31 UTC (rev 179504)
+++ extra-i686/linux-3.7.patch	2013-03-05 18:18:27 UTC (rev 179505)
@@ -1,24 +0,0 @@
-the nvidia drivers are trying to test for version 2.6.6, but fail to take into
-account the first digit.  so 3.7.0+ ends up failing the test.
-
-https://bugs.gentoo.org/447566
-
---- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:20.669633666 -0500
-+++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:34.283334673 -0500
-@@ -1697,13 +1697,15 @@
-                 # kernel older than 2.6.6, that's all we require to
-                 # build the module.
-                 #
-+                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
--                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-+                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
-+                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi
-             fi
-         fi

Deleted: extra-i686/nvidia.install
===================================================================
--- extra-i686/nvidia.install	2013-03-05 18:17:31 UTC (rev 179504)
+++ extra-i686/nvidia.install	2013-03-05 18:18:27 UTC (rev 179505)
@@ -1,18 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-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.7-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/extra-i686/nvidia.install (from rev 179504, nvidia/trunk/nvidia.install)
===================================================================
--- extra-i686/nvidia.install	                        (rev 0)
+++ extra-i686/nvidia.install	2013-03-05 18:18:27 UTC (rev 179505)
@@ -0,0 +1,18 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.7-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.7-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.7-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-03-05 18:17:31 UTC (rev 179504)
+++ extra-x86_64/PKGBUILD	2013-03-05 18:18:27 UTC (rev 179505)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=313.18
-_extramodules=extramodules-3.7-ARCH
-pkgrel=3
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-source=('linux-3.7.patch')
-md5sums=('7c684fab691b15d55a79fd8f9b1a224d')
-
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums+=('780c37c28a6e06e9571cafe348b7da64')
-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+=('fa17a260793a38b4b8ae367db2e03b39')
-fi
-
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    patch -Np3 -i "${srcdir}"/linux-3.7.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/extra-x86_64/PKGBUILD (from rev 179504, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-03-05 18:18:27 UTC (rev 179505)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=313.26
+_extramodules=extramodules-3.7-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux."
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
+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=('3c2f5138d0fec58b27e26c5b37d845b8')
+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=('2d35124fa5a4b009f170fe893b5d07e3')
+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/linux-3.7.patch
===================================================================
--- extra-x86_64/linux-3.7.patch	2013-03-05 18:17:31 UTC (rev 179504)
+++ extra-x86_64/linux-3.7.patch	2013-03-05 18:18:27 UTC (rev 179505)
@@ -1,24 +0,0 @@
-the nvidia drivers are trying to test for version 2.6.6, but fail to take into
-account the first digit.  so 3.7.0+ ends up failing the test.
-
-https://bugs.gentoo.org/447566
-
---- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:20.669633666 -0500
-+++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:34.283334673 -0500
-@@ -1697,13 +1697,15 @@
-                 # kernel older than 2.6.6, that's all we require to
-                 # build the module.
-                 #
-+                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
--                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-+                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
-+                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi
-             fi
-         fi

Deleted: extra-x86_64/nvidia.install
===================================================================
--- extra-x86_64/nvidia.install	2013-03-05 18:17:31 UTC (rev 179504)
+++ extra-x86_64/nvidia.install	2013-03-05 18:18:27 UTC (rev 179505)
@@ -1,18 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-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.7-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/extra-x86_64/nvidia.install (from rev 179504, nvidia/trunk/nvidia.install)
===================================================================
--- extra-x86_64/nvidia.install	                        (rev 0)
+++ extra-x86_64/nvidia.install	2013-03-05 18:18:27 UTC (rev 179505)
@@ -0,0 +1,18 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.7-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.7-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.7-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}




More information about the arch-commits mailing list