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

Ionut Biru ibiru at archlinux.org
Fri Mar 23 08:10:57 UTC 2012


    Date: Friday, March 23, 2012 @ 04:10:57
  Author: ibiru
Revision: 154099

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

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

-------------------------------+
 testing-i686/PKGBUILD         |   96 ++++++++++++++++++----------------------
 testing-i686/nvidia.install   |   30 ++++++------
 testing-x86_64/PKGBUILD       |   96 ++++++++++++++++++----------------------
 testing-x86_64/nvidia.install |   30 ++++++------
 4 files changed, 120 insertions(+), 132 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2012-03-23 08:09:59 UTC (rev 154098)
+++ testing-i686/PKGBUILD	2012-03-23 08:10:57 UTC (rev 154099)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=295.20
-_extramodules=extramodules-3.3-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-pkgrel=5
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.3' 'linux<3.4' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.3' 'linux-headers<3.4')
-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=('a6f702271da49930a17e28b5928fe75a')
-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=('79b05cffa482234833ae1c4bb40664c3')
-fi
-
-build() {
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    # fix for 3.3 kernel
-    sed -i \
-        -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \
-        conftest.sh
-
-    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}/lib/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/lib/modprobe.d/nvidia.conf"
-    echo "blacklist nvidiafb" >> "${pkgdir}/lib/modprobe.d/nvidia.conf"
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-    gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
-}

Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 154098, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-03-23 08:10:57 UTC (rev 154099)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=295.33
+_extramodules=extramodules-3.3-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux."
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.3' 'linux<3.4' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.3' 'linux-headers<3.4')
+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=('1634fb3115526caeae5eb8227282bf17')
+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=('04e814843bcaf23efa0b4b3df4ea2700')
+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}/lib/modprobe.d"
+    echo "blacklist nouveau" >> "${pkgdir}/lib/modprobe.d/nvidia.conf"
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+    gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
+}

Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install	2012-03-23 08:09:59 UTC (rev 154098)
+++ testing-i686/nvidia.install	2012-03-23 08:10:57 UTC (rev 154099)
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/testing-i686/nvidia.install (from rev 154098, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install	                        (rev 0)
+++ testing-i686/nvidia.install	2012-03-23 08:10:57 UTC (rev 154099)
@@ -0,0 +1,15 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.3-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.3-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.3-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2012-03-23 08:09:59 UTC (rev 154098)
+++ testing-x86_64/PKGBUILD	2012-03-23 08:10:57 UTC (rev 154099)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=295.20
-_extramodules=extramodules-3.3-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-pkgrel=5
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.3' 'linux<3.4' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.3' 'linux-headers<3.4')
-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=('a6f702271da49930a17e28b5928fe75a')
-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=('79b05cffa482234833ae1c4bb40664c3')
-fi
-
-build() {
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    # fix for 3.3 kernel
-    sed -i \
-        -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \
-        conftest.sh
-
-    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}/lib/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/lib/modprobe.d/nvidia.conf"
-    echo "blacklist nvidiafb" >> "${pkgdir}/lib/modprobe.d/nvidia.conf"
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-    gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
-}

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 154098, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-03-23 08:10:57 UTC (rev 154099)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=295.33
+_extramodules=extramodules-3.3-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux."
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.3' 'linux<3.4' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.3' 'linux-headers<3.4')
+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=('1634fb3115526caeae5eb8227282bf17')
+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=('04e814843bcaf23efa0b4b3df4ea2700')
+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}/lib/modprobe.d"
+    echo "blacklist nouveau" >> "${pkgdir}/lib/modprobe.d/nvidia.conf"
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+    gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
+}

Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install	2012-03-23 08:09:59 UTC (rev 154098)
+++ testing-x86_64/nvidia.install	2012-03-23 08:10:57 UTC (rev 154099)
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 154098, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install	                        (rev 0)
+++ testing-x86_64/nvidia.install	2012-03-23 08:10:57 UTC (rev 154099)
@@ -0,0 +1,15 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.3-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.3-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.3-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}




More information about the arch-commits mailing list