summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorLenard Spencer <lenardrspencer@gmail.com>2021-01-29 01:51:31 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-01-30 10:29:14 +0700
commit0f58f8644bb3d225db6a26306ff7d1f12edd3501 (patch)
tree3385fed5d31861e08ac7b4538365924719420350 /system
parent000fed4fd23731dbb842976794f3b7cb0853da0f (diff)
downloadslackbuilds-0f58f8644bb3d225db6a26306ff7d1f12edd3501.tar.gz
system/nvidia-legacy390-driver: Build fix.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/nvidia-legacy390-driver/README10
-rw-r--r--system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild11
2 files changed, 13 insertions, 8 deletions
diff --git a/system/nvidia-legacy390-driver/README b/system/nvidia-legacy390-driver/README
index 8e1ebec91f..56e253398f 100644
--- a/system/nvidia-legacy390-driver/README
+++ b/system/nvidia-legacy390-driver/README
@@ -6,9 +6,13 @@ Installing the 32-bit compatibility libraries is available: if desired,
do:
COMPAT32="yes" ./nvidia-legacy390-driver.SlackBuild
-If you plan to test this buildscript on current (15.0 EXPERIMENTAL), to
-avoid stomping on xorg-serverand libglvnd, do:
- CURRENT="yes" ./nvidia-driver.SlackBuild
+If you plan to test this buildscript on current/15.0, do:
+
+ CURRENT="yes" ./nvidia-legacy390-driver.SlackBuild
+
+This avoids stomping on the libglvnd libraries, plus it forces the
+script to use the prebuilt nvidia-installer since it no longer builds
+in current. As a consequence, this script may no longer work in a VM.
If you build and install this driver on current WITHOUT using the
CURRENT="yes" flag, it will corrupt both xorg-server AND libglvnd, so
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index f349baed78..b984a32580 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -108,9 +108,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Compiling the various open source apps instead of using the precompiled binaries
# Compiling nvidia-installer from source
-cd $TMP/nvidia-installer-$VERSION
+if [ "$CURRENT" = "no" ]; then
+ cd $TMP/nvidia-installer-$VERSION
# Let's try to remove the conflicting files and GPU detection
patch -p0 < $CWD/skip_conflict-GPU_detect.patch
@@ -127,12 +127,13 @@ cd $TMP/nvidia-installer-$VERSION
install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
-cd -
+ cd -
# Now we need to copy the newly patched and compiled nvidia-installer
# to the driver source tree for use
-mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
-mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
+ mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
+ mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
+fi
if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"