manuel
/
void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvidia*: always omit the drm dracut module, just in case. 

* Regenerate all initramfs, not just for the running kernel.
* Move initramfs generation to the main pkg not -dkms.
This commit is contained in:
Juan RP 2015-01-08 16:13:32 +01:00
parent 0783cfa648
commit 98c1aa8517
7 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
srcpkgs/nvidia-stable/template
View File

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia-stable pkgname=nvidia-stable
version=340.65 version=340.65
revision=1 revision=2
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -153,6 +153,10 @@ do_install() {
vmkdir usr/lib/modprobe.d vmkdir usr/lib/modprobe.d
echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
# Omit drm dracut module too.
vmkdir usr/lib/dracut/dracut.conf.d
echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
} }
nvidia-stable-dkms_package() { nvidia-stable-dkms_package() {
@ -166,6 +170,7 @@ nvidia-stable-dkms_package() {
vmove usr/src vmove usr/src
vmove usr/lib/modules-load.d vmove usr/lib/modules-load.d
vmove usr/lib/modprobe.d vmove usr/lib/modprobe.d
vmove usr/lib/dracut
} }
} }
nvidia-stable-opencl_package() { nvidia-stable-opencl_package() {

2
srcpkgs/nvidia304/nvidia304-dkms.INSTALL → srcpkgs/nvidia/INSTALL
View File

@ -2,6 +2,6 @@
case ${ACTION} in case ${ACTION} in
post) post)
echo "Regenerating initramfs, please wait..." echo "Regenerating initramfs, please wait..."
dracut -f -q dracut -f -q --regenerate-all
;; ;;
esac esac

2
srcpkgs/nvidia304/nvidia304-dkms.REMOVE → srcpkgs/nvidia/REMOVE
View File

@ -2,6 +2,6 @@
case ${ACTION} in case ${ACTION} in
purge) purge)
echo "Regenerating initramfs, please wait..." echo "Regenerating initramfs, please wait..."
dracut -f -q dracut -f -q --regenerate-all
;; ;;
esac esac

7
srcpkgs/nvidia/template
View File

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia pkgname=nvidia
version=343.36 version=343.36
revision=1 revision=2
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -153,6 +153,10 @@ do_install() {
vmkdir usr/lib/modprobe.d vmkdir usr/lib/modprobe.d
echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
# Omit drm dracut module too.
vmkdir usr/lib/dracut/dracut.conf.d
echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
} }
nvidia-dkms_package() { nvidia-dkms_package() {
@ -164,6 +168,7 @@ nvidia-dkms_package() {
vmove usr/src vmove usr/src
vmove usr/lib/modules-load.d vmove usr/lib/modules-load.d
vmove usr/lib/modprobe.d vmove usr/lib/modprobe.d
vmove usr/lib/dracut
} }
} }
nvidia-opencl_package() { nvidia-opencl_package() {

0
srcpkgs/nvidia/nvidia-dkms.INSTALL → srcpkgs/nvidia304/INSTALL
View File

0
srcpkgs/nvidia/nvidia-dkms.REMOVE → srcpkgs/nvidia304/REMOVE
View File

7
srcpkgs/nvidia304/template
View File

@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
pkgname=nvidia304 pkgname=nvidia304
version=304.125 version=304.125
revision=1 revision=2
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -132,6 +132,10 @@ do_install() {
# opencl pkg # opencl pkg
vinstall nvidia.icd 644 etc/OpenCL/vendors vinstall nvidia.icd 644 etc/OpenCL/vendors
# Omit drm dracut module too.
vmkdir usr/lib/dracut/dracut.conf.d
echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
vinstall libnvidia-compiler.so.${version} 755 usr/lib vinstall libnvidia-compiler.so.${version} 755 usr/lib
ln -sf libnvidia-compiler.so.${version} \ ln -sf libnvidia-compiler.so.${version} \
${DESTDIR}/usr/lib/libnvidia-compiler.so ${DESTDIR}/usr/lib/libnvidia-compiler.so
@ -156,6 +160,7 @@ nvidia304-dkms_package() {
vmove usr/src vmove usr/src
vmove usr/lib/modules-load.d vmove usr/lib/modules-load.d
vmove usr/lib/modprobe.d vmove usr/lib/modprobe.d
vmove usr/lib/dracut
} }
} }
nvidia304-opencl_package() { nvidia304-opencl_package() {