[arch-commits] Commit in nvidia-340xx/repos (10 files)
Felix Yan
fyan at archlinux.org
Fri Sep 4 05:46:27 UTC 2015
Date: Friday, September 4, 2015 @ 07:46:27
Author: fyan
Revision: 245256
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nvidia-340xx/repos/staging-i686/
nvidia-340xx/repos/staging-i686/PKGBUILD
(from rev 245255, nvidia-340xx/trunk/PKGBUILD)
nvidia-340xx/repos/staging-i686/nv-drm.patch
(from rev 245255, nvidia-340xx/trunk/nv-drm.patch)
nvidia-340xx/repos/staging-i686/nvidia-340xx-dkms.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
nvidia-340xx/repos/staging-i686/nvidia-340xx.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx.install)
nvidia-340xx/repos/staging-x86_64/
nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 245255, nvidia-340xx/trunk/PKGBUILD)
nvidia-340xx/repos/staging-x86_64/nv-drm.patch
(from rev 245255, nvidia-340xx/trunk/nv-drm.patch)
nvidia-340xx/repos/staging-x86_64/nvidia-340xx-dkms.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx.install)
------------------------------------------+
staging-i686/PKGBUILD | 69 +++++++++++++++++++++++++++++
staging-i686/nv-drm.patch | 27 +++++++++++
staging-i686/nvidia-340xx-dkms.install | 30 ++++++++++++
staging-i686/nvidia-340xx.install | 13 +++++
staging-x86_64/PKGBUILD | 69 +++++++++++++++++++++++++++++
staging-x86_64/nv-drm.patch | 27 +++++++++++
staging-x86_64/nvidia-340xx-dkms.install | 30 ++++++++++++
staging-x86_64/nvidia-340xx.install | 13 +++++
8 files changed, 278 insertions(+)
Copied: nvidia-340xx/repos/staging-i686/PKGBUILD (from rev 245255, nvidia-340xx/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.93
+_extramodules=extramodules-4.2-ARCH
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ nv-drm.patch)
+md5sums=('4a7edf6838a80c77a57fb6f6ec7f0437'
+ 'cb80e3f1cb6f2fb6e6eab35fad0884e4'
+ '79671a27131da619a33eb02ed0c2c031')
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -p0 -i ../nv-drm.patch
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+ cd uvm
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+ pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+ depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}")
+ conflict+=('nvidia-340xx-dkms')
+ install=nvidia-340xx.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
+
+package_nvidia-340xx-dkms() {
+ pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+ depends=('dkms' "nvidia-340xx-utils=$pkgver")
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflict+=('nvidia-340xx')
+ install=nvidia-340xx-dkms.install
+
+ cd ${_pkg}
+ make -C kernel clean
+ install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+ cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver}
+ echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+}
Copied: nvidia-340xx/repos/staging-i686/nv-drm.patch (from rev 245255, nvidia-340xx/trunk/nv-drm.patch)
===================================================================
--- staging-i686/nv-drm.patch (rev 0)
+++ staging-i686/nv-drm.patch 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include <drm/drmP.h>
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
++++ kernel/nv-drm.c
+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
+ .gem_prime_vmap = nv_gem_prime_vmap,
+ .gem_prime_vunmap = nv_gem_prime_vunmap,
+
++ .set_busid = drm_pci_set_busid,
++
+ .name = "nvidia-drm",
+ .desc = "NVIDIA DRM driver",
+ .date = "20130102",
Copied: nvidia-340xx/repos/staging-i686/nvidia-340xx-dkms.install (from rev 245255, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
===================================================================
--- staging-i686/nvidia-340xx-dkms.install (rev 0)
+++ staging-i686/nvidia-340xx-dkms.install 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add nvidia/${1%-*}
+ cat << EOF
+==> To build and install your modules run: dkms install nvidia/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Copied: nvidia-340xx/repos/staging-i686/nvidia-340xx.install (from rev 245255, nvidia-340xx/trunk/nvidia-340xx.install)
===================================================================
--- staging-i686/nvidia-340xx.install (rev 0)
+++ staging-i686/nvidia-340xx.install 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.2-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 245255, nvidia-340xx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.93
+_extramodules=extramodules-4.2-ARCH
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ nv-drm.patch)
+md5sums=('4a7edf6838a80c77a57fb6f6ec7f0437'
+ 'cb80e3f1cb6f2fb6e6eab35fad0884e4'
+ '79671a27131da619a33eb02ed0c2c031')
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -p0 -i ../nv-drm.patch
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+ cd uvm
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+ pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+ depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}")
+ conflict+=('nvidia-340xx-dkms')
+ install=nvidia-340xx.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
+
+package_nvidia-340xx-dkms() {
+ pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+ depends=('dkms' "nvidia-340xx-utils=$pkgver")
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflict+=('nvidia-340xx')
+ install=nvidia-340xx-dkms.install
+
+ cd ${_pkg}
+ make -C kernel clean
+ install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+ cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver}
+ echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+}
Copied: nvidia-340xx/repos/staging-x86_64/nv-drm.patch (from rev 245255, nvidia-340xx/trunk/nv-drm.patch)
===================================================================
--- staging-x86_64/nv-drm.patch (rev 0)
+++ staging-x86_64/nv-drm.patch 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include <drm/drmP.h>
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
++++ kernel/nv-drm.c
+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
+ .gem_prime_vmap = nv_gem_prime_vmap,
+ .gem_prime_vunmap = nv_gem_prime_vunmap,
+
++ .set_busid = drm_pci_set_busid,
++
+ .name = "nvidia-drm",
+ .desc = "NVIDIA DRM driver",
+ .date = "20130102",
Copied: nvidia-340xx/repos/staging-x86_64/nvidia-340xx-dkms.install (from rev 245255, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
===================================================================
--- staging-x86_64/nvidia-340xx-dkms.install (rev 0)
+++ staging-x86_64/nvidia-340xx-dkms.install 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add nvidia/${1%-*}
+ cat << EOF
+==> To build and install your modules run: dkms install nvidia/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Copied: nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install (from rev 245255, nvidia-340xx/trunk/nvidia-340xx.install)
===================================================================
--- staging-x86_64/nvidia-340xx.install (rev 0)
+++ staging-x86_64/nvidia-340xx.install 2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.2-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list