diff options
-rw-r--r-- | core/modules/nvidia-common/module.build | 12 | ||||
-rw-r--r-- | core/modules/nvidia-libs/module.conf | 5 |
2 files changed, 13 insertions, 4 deletions
diff --git a/core/modules/nvidia-common/module.build b/core/modules/nvidia-common/module.build index cf648656..e9105c18 100644 --- a/core/modules/nvidia-common/module.build +++ b/core/modules/nvidia-common/module.build @@ -47,6 +47,7 @@ build() { || /NVIDIA/nvidia-installer --no-nouveau-check --no-network --no-backup --no-rpms --no-runlevel-check \ --no-distro-scripts --no-cc-version-check --no-x-check --no-precompiled-interface --silent \ --no-kernel-module + exit 0 # Fake it since it will try to load the module and probably fail EOF if grep -qE "$KMOD_ERROR" "${builddir}${KMOD_LOG}"; then @@ -61,6 +62,17 @@ build() { mv "${builddir}/overlay.whiteout.list" "${builddir}/opt/openslx/etc/nvidia.whiteout" fi + ldconfig -v -n -r "${builddir}" /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/vdpau/ /usr/lib/xorg/modules/extensions/ + # These sometimes maybe don't get created + [ -f "${builddir}/usr/lib/x86_64-linux-gnu/vdpau/libvdpau_nvidia.so.${version}" ] \ + && ln -nfs "vdpau/libvdpau_nvidia.so.${version}" "${builddir}/usr/lib/x86_64-linux-gnu/libvdpau_nvidia.so" + if [ -f "${builddir}/usr/lib/x86_64-linux-gnu/libGLX_nvidia.so.${version}" ]; then + ln -nfs "libGLX_nvidia.so.${version}" "${builddir}/usr/lib/x86_64-linux-gnu/libGLX_nvidia.so.0" + ln -nfs "libGLX_nvidia.so.${version}" "${builddir}/usr/lib/x86_64-linux-gnu/libGLX_indirect.so.0" + fi + [ -f "${builddir}/usr/lib/xorg/modules/extensions/libglxserver_nvidia.so.${version}" ] \ + && ln -nfs "libglxserver_nvidia.so.${version}" "${builddir}/usr/lib/xorg/modules/extensions/libglxserver_nvidia.so" + # Kernel related - outside of version subdir ($builddir) NVIDIA_MODULES="${MODULE_BUILD_DIR}/lib/modules/nvidia/${version}" mkdir -p "$NVIDIA_MODULES" diff --git a/core/modules/nvidia-libs/module.conf b/core/modules/nvidia-libs/module.conf index d66a58af..13a190f3 100644 --- a/core/modules/nvidia-libs/module.conf +++ b/core/modules/nvidia-libs/module.conf @@ -9,10 +9,7 @@ REQUIRED_DIRECTORIES=" /usr/bin /usr/lib /var/lib/nvidia - /usr/share/nvidia - /usr/share/egl - /usr/share/glvnd - /usr/share/X11 + /usr/share " REQUIRED_MODULES=" |