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

Felix Yan fyan at archlinux.org
Fri Sep 4 09:28:17 UTC 2015


    Date: Friday, September 4, 2015 @ 11:28:16
  Author: fyan
Revision: 245271

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

Added:
  nvidia/repos/staging-i686/
  nvidia/repos/staging-i686/PKGBUILD
    (from rev 245270, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-i686/nv-drm-343.36.patch
    (from rev 245270, nvidia/trunk/nv-drm-343.36.patch)
  nvidia/repos/staging-i686/nvidia-dkms.install
    (from rev 245270, nvidia/trunk/nvidia-dkms.install)
  nvidia/repos/staging-i686/nvidia.install
    (from rev 245270, nvidia/trunk/nvidia.install)
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
    (from rev 245270, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/nv-drm-343.36.patch
    (from rev 245270, nvidia/trunk/nv-drm-343.36.patch)
  nvidia/repos/staging-x86_64/nvidia-dkms.install
    (from rev 245270, nvidia/trunk/nvidia-dkms.install)
  nvidia/repos/staging-x86_64/nvidia.install
    (from rev 245270, nvidia/trunk/nvidia.install)

------------------------------------+
 staging-i686/PKGBUILD              |   78 +++++++++++++++++++++++++++++++++++
 staging-i686/nv-drm-343.36.patch   |   14 ++++++
 staging-i686/nvidia-dkms.install   |   30 +++++++++++++
 staging-i686/nvidia.install        |   13 +++++
 staging-x86_64/PKGBUILD            |   78 +++++++++++++++++++++++++++++++++++
 staging-x86_64/nv-drm-343.36.patch |   14 ++++++
 staging-x86_64/nvidia-dkms.install |   30 +++++++++++++
 staging-x86_64/nvidia.install      |   13 +++++
 8 files changed, 270 insertions(+)

Copied: nvidia/repos/staging-i686/PKGBUILD (from rev 245270, nvidia/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-09-04 09:28:16 UTC (rev 245271)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=355.11
+_extramodules=extramodules-4.2-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+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")
+md5sums=('16d143ccafe99328a2ca8e5a396fd4bc'
+         '30133d89690f4683c4e289ec6c0247dc')
+
+[[ "$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
+
+    cp -a kernel kernel-dkms
+    cd kernel-dkms
+    eval "sed -i 's/__VERSION_STRING/${pkgver}/' dkms.conf"
+    sed -i 's/__JOBS/${&}/' dkms.conf
+    sed -i '4iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+__JOBS=`nproc`' dkms.conf
+    sed -i 's/__DKMS_MODULES//' dkms.conf
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${_pkg}"/kernel
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+    pkgdesc="NVIDIA drivers for linux"
+    depends=('linux>=4.2' 'linux<4.3' "nvidia-utils=${pkgver}" 'libgl')
+    install=nvidia.install
+
+    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+    if [[ "$CARCH" = "x86_64" ]]; then
+        install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
+            "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+    fi
+
+    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-dkms() {
+    pkgdesc="NVIDIA driver sources for linux"
+    depends=('dkms' "nvidia-utils=$pkgver")
+    optdepends=('linux-headers: Build the module for Arch kernel'
+                'linux-lts-headers: Build the module for LTS Arch kernel')
+    conflict+=('nvidia')
+    install=nvidia-dkms.install
+
+    cd ${_pkg}
+    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+    echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia/repos/staging-i686/nv-drm-343.36.patch (from rev 245270, nvidia/trunk/nv-drm-343.36.patch)
===================================================================
--- staging-i686/nv-drm-343.36.patch	                        (rev 0)
+++ staging-i686/nv-drm-343.36.patch	2015-09-04 09:28:16 UTC (rev 245271)
@@ -0,0 +1,14 @@
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index c0b41a0..700c193 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -128,6 +128,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/repos/staging-i686/nvidia-dkms.install (from rev 245270, nvidia/trunk/nvidia-dkms.install)
===================================================================
--- staging-i686/nvidia-dkms.install	                        (rev 0)
+++ staging-i686/nvidia-dkms.install	2015-09-04 09:28:16 UTC (rev 245271)
@@ -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:
\ No newline at end of file

Copied: nvidia/repos/staging-i686/nvidia.install (from rev 245270, nvidia/trunk/nvidia.install)
===================================================================
--- staging-i686/nvidia.install	                        (rev 0)
+++ staging-i686/nvidia.install	2015-09-04 09:28:16 UTC (rev 245271)
@@ -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/repos/staging-x86_64/PKGBUILD (from rev 245270, nvidia/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-09-04 09:28:16 UTC (rev 245271)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=355.11
+_extramodules=extramodules-4.2-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+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")
+md5sums=('16d143ccafe99328a2ca8e5a396fd4bc'
+         '30133d89690f4683c4e289ec6c0247dc')
+
+[[ "$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
+
+    cp -a kernel kernel-dkms
+    cd kernel-dkms
+    eval "sed -i 's/__VERSION_STRING/${pkgver}/' dkms.conf"
+    sed -i 's/__JOBS/${&}/' dkms.conf
+    sed -i '4iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+__JOBS=`nproc`' dkms.conf
+    sed -i 's/__DKMS_MODULES//' dkms.conf
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${_pkg}"/kernel
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+    pkgdesc="NVIDIA drivers for linux"
+    depends=('linux>=4.2' 'linux<4.3' "nvidia-utils=${pkgver}" 'libgl')
+    install=nvidia.install
+
+    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+    if [[ "$CARCH" = "x86_64" ]]; then
+        install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
+            "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+    fi
+
+    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-dkms() {
+    pkgdesc="NVIDIA driver sources for linux"
+    depends=('dkms' "nvidia-utils=$pkgver")
+    optdepends=('linux-headers: Build the module for Arch kernel'
+                'linux-lts-headers: Build the module for LTS Arch kernel')
+    conflict+=('nvidia')
+    install=nvidia-dkms.install
+
+    cd ${_pkg}
+    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+    echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia/repos/staging-x86_64/nv-drm-343.36.patch (from rev 245270, nvidia/trunk/nv-drm-343.36.patch)
===================================================================
--- staging-x86_64/nv-drm-343.36.patch	                        (rev 0)
+++ staging-x86_64/nv-drm-343.36.patch	2015-09-04 09:28:16 UTC (rev 245271)
@@ -0,0 +1,14 @@
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index c0b41a0..700c193 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -128,6 +128,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/repos/staging-x86_64/nvidia-dkms.install (from rev 245270, nvidia/trunk/nvidia-dkms.install)
===================================================================
--- staging-x86_64/nvidia-dkms.install	                        (rev 0)
+++ staging-x86_64/nvidia-dkms.install	2015-09-04 09:28:16 UTC (rev 245271)
@@ -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:
\ No newline at end of file

Copied: nvidia/repos/staging-x86_64/nvidia.install (from rev 245270, nvidia/trunk/nvidia.install)
===================================================================
--- staging-x86_64/nvidia.install	                        (rev 0)
+++ staging-x86_64/nvidia.install	2015-09-04 09:28:16 UTC (rev 245271)
@@ -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