system/nvidia-legacy390-driver: Remove nvidia-installer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 26 insertions, 22 deletions

diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index ac24680652eb..1f3d2e37945e 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-legacy390-driver
 VERSION=${VERSION:-390.157}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -291,8 +291,8 @@ sed -i '/Encoding/d' $PKG/usr/share/applications/nvidia-settings.desktop
 
 # rename wrong/conficting files as needed; remove conflicting symlinks created by installer
 cd $PKG/usr/lib$LIBDIRSUFFIX
-  rm libGL.la
-  rm libOpenCL.so*
+  rm -f libGL.la
+  rm -f libOpenCL.so*
   rm -f xorg/modules/libwfb.so
   if [ -e xorg/modules/extensions/libglx.so ]; then
     rm -f xorg/modules/extensions/libglx.so
@@ -301,15 +301,15 @@ cd -
 
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   cd $PKG/usr/lib
-  rm libGL.la
-  rm libOpenCL.so.1.0.0
+  rm -f libGL.la
+  rm -f libOpenCL.so.1.0.0
   cd -
 # FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1
 # symlink to $PKG/usr/lib64/libGL.so.1 appears? Who would do this,
 # so ignoring for now.
 fi
 
-# Remove xorg.conf.d file since we handle that in nvidia-legacy390-kernel
+# Remove xorg.conf.d folder since we handle that in nvidia-legacy390-kernel
 rm -rf $PKG/etc/X11/xorg.conf.d
 
 cd $TMP/$SRCNAM
@@ -338,29 +338,33 @@ sed "s/SUFFIX/$LIBDIRSUFFIX/g" $CWD/douninst.sh > $PKG/install/douninst.sh
 # Add rc.nvidia-persistenced:
 if [ "${PERSISTENCED:-no}" = "yes" ]; then
   cd $TMP
-  rm -rf nvidia-persistenced-$VERSION.tar.bz2
-  tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
+  rm -rf nvidia-persistenced-$VERSION
+  tar -xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
 # Compiling nvidia-persistenced
   cd $TMP/nvidia-persistenced-$VERSION
 # Patch for tirpc (backport from 470.xx):
-  patch -p1 < $CWD/nvidia-persistenced-390-tirpc.patch
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+    patch -p1 < $CWD/nvidia-persistenced-390-tirpc.patch
+    chown -R root:root .
+    find -L . \
+     \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+      -o -perm 511 \) -exec chmod 755 {} \; -o \
+     \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+      -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-  CFLAGS="$SLKCFLAGS" make
-  install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
-  install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
+    CFLAGS="$SLKCFLAGS" make
+    install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
+    install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
 # install rc.nvidia-perstistenced:
-  mkdir -p $PKG/etc/rc.d $PKG/var/run/nvidia-persistenced
-  install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
-  sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
-  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
+    mkdir -p $PKG/etc/rc.d $PKG/var/run/nvidia-persistenced
+    install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
+    sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
+    chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
+  cd -
 fi
 
+# We must now remove our custom nvidia-installer as it will no longer
+# work on an installed driver:
+rm -f $PKG/usr/bin/nvidia-{installer,uninstall}
 
 # Flag multlib as needed and build package.
 cd $PKG