aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLenard Spencer <lenardrspencer@gmail.com>2024-08-27 11:48:45 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-08-27 11:58:46 +0700
commit7f613a4cc1e9e7fb4dfa9d98fc3b1a52f24e8b1f (patch)
tree75283243223a471e2422e33b499a122572465e6a
parentf016834dd89731f100bc404b00f707911149addf (diff)
system/nvidia-legacy470-driver: Remove nvidia-installer.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild15
1 files changed, 9 insertions, 6 deletions
diff --git a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild
index 39b50349610b2..560ebfc2845cd 100644
--- a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild
+++ b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=nvidia-legacy470-driver
VERSION=${VERSION:-470.256.02}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -251,8 +251,7 @@ cd $TMP/nvidia-xconfig-$VERSION
cd -
# Some optional utilities, such as laptop for possible GPU switching and
-# nvidia-modprobe needed to create device nodes, see README!
-# FIXME: Needs cleanup at a later date.
+# nvidia-modprobe needed to create device nodes
# Compiling nvidia-modprobe
cd $TMP/nvidia-modprobe-$VERSION
@@ -276,8 +275,8 @@ sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;|" $PKG/usr/share/appl
# Remove depcrecated entry in nvidia-settings.desktop
sed -i '/Encoding/d' $PKG/usr/share/applications/nvidia-settings.desktop
-# Remove xorg conf file since we handle that in nvidia-kernel
-rm -rf $PKG/etc/X11/xorg.conf.d
+# Remove xorg conf folder since we handle that in nvidia-kernel
+rm -f $PKG/etc/X11/xorg.conf.d
cd $TMP/$SRCNAM
# put docs in the right place
@@ -301,7 +300,7 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
# Add rc.nvidia-persistenced:
if [ "${PERSISTENCED:-no}" = "yes" ]; then
cd $TMP
- rm -rf 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
@@ -322,6 +321,10 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then
chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
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
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE