diff options
| author | Lenard Spencer <lenardrspencer@gmail.com> | 2023-02-09 23:06:53 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-02-11 09:30:36 +0700 |
| commit | 7ef4eca93b710504324fd97386955ddb02f16b0c (patch) | |
| tree | a20bb4419fffddbac0ff017d571496ba9ded4c65 /system | |
| parent | 0b4016ab05e1ab8b81880459c99cbf50b4a6373d (diff) | |
system/nvidia-legacy390-driver: Fix build.
Signed-off-by: bedlam <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild index 8125ef92b67f..06978105c298 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for nvidia-legacy390-driver # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA -# Copyright 2020 Lenard Spencer, Orlando, FL, USA +# Copyright 2020-2023 Lenard Spencer, Orlando, FL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-legacy390-driver VERSION=${VERSION:-390.157} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -97,7 +97,6 @@ mkdir -p $TMP $PKG $OUTPUT $PKG/install mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \ $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1} \ $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \ - $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/etc/X11/xorg.conf.d \ $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log @@ -134,6 +133,10 @@ cd $TMP/nvidia-installer-$VERSION # Let's try to remove the conflicting files and GPU detection patch -p0 < $CWD/skip_conflict-GPU_detect.patch +# Install various files in $PKG instead of the root filesystem: + sed -i "s|/etc/vulkan|$PKG/etc/vulkan|" files.c + sed -i "s|\"/etc\"|\"$PKG/etc\"|" nvidia-installer.h + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -184,11 +187,13 @@ cd $TMP/$SRCNAM --log-file-name=$PKG/var/log/nvidia-installer.log \ --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \ --no-nvidia-modprobe \ + --no-install-libglvnd \ $COMP32 -# Move ICDs to $PKG and cleanup (no switch option in installer?) -mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd -mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json +# Remove a /var/lib/nvidia entry installed by nvidia-installer but +# no longer needed (caused the "failed to remove some directories" +# warning message): +rm -rf /var/lib/nvidia # Compile utilites from source, replacing the precompiled versions # @@ -280,7 +285,7 @@ cd $PKG/usr/lib$LIBDIRSUFFIX rm libOpenCL.so* rm -f xorg/modules/libwfb.so if [ -e xorg/modules/extensions/libglx.so ]; then - rm -f xorg/modules/extionsions/libglx.so + rm -f xorg/modules/extensions/libglx.so fi cd - @@ -294,7 +299,7 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then # so ignoring for now. fi -# Remove xorg conf file since we handle that in nvidia-legacy390-kernel +# Remove xorg.conf.d file since we handle that in nvidia-legacy390-kernel rm -rf $PKG/etc/X11/xorg.conf.d cd $TMP/$SRCNAM |