From cc75440f1012439c76a7433016683cc55d05df3b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 17 Jul 2018 12:06:56 +0200 Subject: [PATCH 1/4] nvidia-mxlinks: Remove trailing spaces --- nvidia-mxlinks.be0 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nvidia-mxlinks.be0 b/nvidia-mxlinks.be0 index 6dab0937a..ffff91152 100755 --- a/nvidia-mxlinks.be0 +++ b/nvidia-mxlinks.be0 @@ -6,7 +6,7 @@ EXCLUDE=("^/usr/lib/(X11|xorg)(|/modules(|/drivers))$") mee_install() { mkdir -pv ${D}{${LIBDIR}/{X11,xorg}/modules/drivers,${DATAROOTDIR},${BINDIR}} - + NVLIBS=( "libnvidia-ml.so.1" "libnvidia-wfb.so.1" @@ -22,38 +22,38 @@ mee_install() { "libnvidia-tls.so.1" "libXvMCNVIDIA_dynamic.so.1" ) - + for i in ${NVLIBS[@]} ; do ln -sv /usr/share/mxgfx/lib/${i} ${D}${LIBDIR}/${i} done - + ln -sv libvdpau_nvidia.so.1 ${D}${LIBDIR}/libvdpau_nvidia.so - + ln -sv /node/usr_share_mxgfx \ ${D}${DATAROOTDIR}/mxgfx - + ln -sv /usr/share/mxgfx/drivers/nvidia_drv.so \ ${D}${LIBDIR}/X11/modules/drivers/nvidia_drv.so ln -sv /usr/share/mxgfx/drivers/nvidia_drv.so \ ${D}${LIBDIR}/xorg/modules/drivers/nvidia_drv.so - + ln -sv /usr/share/mxgfx/bin/nvidia-settings \ ${D}${BINDIR} - + ln -sv /usr/share/mxgfx/bin/nvidia-xconfig \ ${D}${BINDIR} ln -sv /usr/share/mxgfx/bin/nvidia-smi \ ${D}${BINDIR} - + mkdir -pv ${D}/usr/share/nvidia/pciidhints - + # for driver 96.43.xx for id in 0185 0110 0172 0181 0171 ; do ln -vs legacy2 ${D}/usr/share/nvidia/pciidhints/10de:${id} done - + # for driver 173.14.xx for id in 0322 0326 ; do ln -vs legacy3 ${D}/usr/share/nvidia/pciidhints/10de:${id} @@ -63,9 +63,9 @@ mee_install() { for id in 0393 ; do ln -vs legacy4 ${D}/usr/share/nvidia/pciidhints/10de:${id} done - + # for GPU series 340.xx - + for id in 06fd 0659 06fa 0a38 10c3; do ln -vs legacy5 ${D}/usr/share/nvidia/pciidhints/10de:${id} done From a08f5c93cd427dd5e9a0bb3e85531f4bb5921ea4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 17 Jul 2018 12:07:36 +0200 Subject: [PATCH 2/4] nvidia-mxlinks: Remove unneeded blank line --- nvidia-mxlinks.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/nvidia-mxlinks.be0 b/nvidia-mxlinks.be0 index ffff91152..eab7603ce 100755 --- a/nvidia-mxlinks.be0 +++ b/nvidia-mxlinks.be0 @@ -69,5 +69,4 @@ mee_install() { for id in 06fd 0659 06fa 0a38 10c3; do ln -vs legacy5 ${D}/usr/share/nvidia/pciidhints/10de:${id} done - } From d71978f4df21ce09598d74fc0a72003076b6750f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 17 Jul 2018 12:12:29 +0200 Subject: [PATCH 3/4] nvidia-mxlinks: Add GeForce GT 240M (10de:0a34) to legacy5 Currently, the proprietary Nvidia driver is used for the GeForce GT 240M (10de:0a34), which is not supported by the driver. So, add device code 0a34 to legacy5 list, so that Nouveau is used. Fixes: https://github.molgen.mpg.de/mariux64/bee-files/issues/842 --- nvidia-mxlinks.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvidia-mxlinks.be0 b/nvidia-mxlinks.be0 index eab7603ce..7d8282bff 100755 --- a/nvidia-mxlinks.be0 +++ b/nvidia-mxlinks.be0 @@ -66,7 +66,7 @@ mee_install() { # for GPU series 340.xx - for id in 06fd 0659 06fa 0a38 10c3; do + for id in 06fd 0659 06fa 0a34 0a38 10c3; do ln -vs legacy5 ${D}/usr/share/nvidia/pciidhints/10de:${id} done } From 3cddc94b2b73014b80e954a77d2b49b656be94ce Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 17 Jul 2018 12:12:42 +0200 Subject: [PATCH 4/4] nvidia-mxlinks: Increment revision to 7 --- nvidia-mxlinks.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvidia-mxlinks.be0 b/nvidia-mxlinks.be0 index 7d8282bff..8bc331ec2 100755 --- a/nvidia-mxlinks.be0 +++ b/nvidia-mxlinks.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION nvidia-mxlinks-0.8-6 +# BEE_VERSION nvidia-mxlinks-0.8-7 EXCLUDE=("^/usr/lib/(X11|xorg)(|/modules(|/drivers))$")