From f11c21626adb7f82a8d5e90469420cfc9f00d3de Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 11 Dec 2017 21:25:20 +0000 Subject: nvidia-340xx & nvidia-304xx: rebuild add back .install --- abs/core/nvidia-304xx/PKGBUILD | 3 ++- abs/core/nvidia-304xx/__changelog | 1 + abs/core/nvidia-304xx/nvidia-304xx.install | 13 +++++++++++++ abs/core/nvidia-340xx/PKGBUILD | 3 ++- abs/core/nvidia-340xx/__changelog | 1 + abs/core/nvidia-340xx/nvidia-340xx.install | 13 +++++++++++++ 6 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 abs/core/nvidia-304xx/__changelog create mode 100644 abs/core/nvidia-304xx/nvidia-304xx.install create mode 100644 abs/core/nvidia-340xx/__changelog create mode 100644 abs/core/nvidia-340xx/nvidia-340xx.install diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD index cb0b9e9..c370fa8 100644 --- a/abs/core/nvidia-304xx/PKGBUILD +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=nvidia-304xx pkgname=(nvidia-304xx nvidia-304xx-dkms) pkgver=304.137 _extramodules=extramodules-4.9-ARCH -pkgrel=8 +pkgrel=9 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" arch=('x86_64') url="http://www.nvidia.com/" @@ -44,6 +44,7 @@ build() { package_nvidia-304xx() { pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" depends=('linux>=4.9' 'linux<4.10' "nvidia-304xx-utils=${pkgver}" 'libgl') + install=nvidia-304xx.install install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \ "${srcdir}/${_pkg}/kernel"/nvidia.ko diff --git a/abs/core/nvidia-304xx/__changelog b/abs/core/nvidia-304xx/__changelog new file mode 100644 index 0000000..0cde00d --- /dev/null +++ b/abs/core/nvidia-304xx/__changelog @@ -0,0 +1 @@ +PKGBUILD: keep .install for depmod diff --git a/abs/core/nvidia-304xx/nvidia-304xx.install b/abs/core/nvidia-304xx/nvidia-304xx.install new file mode 100644 index 0000000..9858d46 --- /dev/null +++ b/abs/core/nvidia-304xx/nvidia-304xx.install @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.9-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 +} diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index bff3ae3..a639d7f 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=nvidia-340xx pkgname=(nvidia-340xx nvidia-340xx-dkms) pkgver=340.104 _extramodules=extramodules-4.9-ARCH -pkgrel=7 +pkgrel=8 pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" arch=('x86_64') url="http://www.nvidia.com/" @@ -45,6 +45,7 @@ build() { package_nvidia-340xx() { pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" depends=('linux>=4.9' 'linux<4.10' "nvidia-340xx-utils=${pkgver}" 'libgl') + install=nvidia-340xx.install install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \ "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko diff --git a/abs/core/nvidia-340xx/__changelog b/abs/core/nvidia-340xx/__changelog new file mode 100644 index 0000000..0cde00d --- /dev/null +++ b/abs/core/nvidia-340xx/__changelog @@ -0,0 +1 @@ +PKGBUILD: keep .install for depmod diff --git a/abs/core/nvidia-340xx/nvidia-340xx.install b/abs/core/nvidia-340xx/nvidia-340xx.install new file mode 100644 index 0000000..9858d46 --- /dev/null +++ b/abs/core/nvidia-340xx/nvidia-340xx.install @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.9-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 +} -- cgit v0.12 From 9fa12d0432d007f15c8083aa8242aba6f8bae296 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 11 Dec 2017 21:32:26 +0000 Subject: system-templates: xorg.nvidia: add ModulePath to make sure nvidia versions are sourced. The ISO sometimes doesn't use the right path for glx and so opengl apps would fail --- abs/core/system-templates/PKGBUILD | 2 +- abs/core/system-templates/templates/xorg/xorg.nvidia | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 2fe4317..2b017d9 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=8.5 -pkgrel=1 +pkgrel=2 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/templates/xorg/xorg.nvidia b/abs/core/system-templates/templates/xorg/xorg.nvidia index 75a90cd..eae5162 100644 --- a/abs/core/system-templates/templates/xorg/xorg.nvidia +++ b/abs/core/system-templates/templates/xorg/xorg.nvidia @@ -5,3 +5,7 @@ Section "Device" Option "DPI" "100 x 100" Option "NoLogo" "1" EndSection + +Section "Files" + ModulePath "/usr/lib/nvidia/xorg,/usr/lib/xorg/modules" +EndSection -- cgit v0.12 From bcfdb82efc43195d9fa214bf256d91573c65828e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 11 Dec 2017 21:35:42 +0000 Subject: LinHES-config: LinHES-release: update for R8.5.1 --- abs/core/LinHES-config/LinHES-release | 2 +- abs/core/LinHES-config/PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release index 17fbb93..b3360a3 100644 --- a/abs/core/LinHES-config/LinHES-release +++ b/abs/core/LinHES-config/LinHES-release @@ -1 +1 @@ -LinHES R8.5 (Gareth) +LinHES R8.5.1 (Gareth) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index a296661..86a9c5c 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config -pkgver=8.5 -pkgrel=2 +pkgver=8.5.1 +pkgrel=1 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -156,7 +156,7 @@ md5sums=('518c868141fe443e9258144c029ed3f9' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' '1f58c0393a131f4a8f9a84b3fe08a7e4' - '589968ef48f2b472774257cdce9197c0' + '55ac9212faa4efa7f9cb67a35640817e' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' 'd429b59d3cfb37b0624c6a4a71a7c2c0' -- cgit v0.12