diff options
Diffstat (limited to 'system/nvidia-driver/nvidia-driver.SlackBuild')
-rw-r--r-- | system/nvidia-driver/nvidia-driver.SlackBuild | 245 |
1 files changed, 117 insertions, 128 deletions
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 8649a1493a..e8e7cf0a8b 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -2,7 +2,9 @@ # Slackware build script for nvidia-driver -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, US +# Copyright 2020 Lenard Spencer, Orlando, FL, USA +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,12 +27,11 @@ # see changelog.txt PRGNAM=nvidia-driver -VERSION=${VERSION:-410.78} +VERSION=${VERSION:-460.67} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -GLVND=${GLVND:-yes} -# libglnvd may land in mesa and is Nvidia recommended +CURRENT=${CURRENT:-no} set -e @@ -58,6 +59,14 @@ else exit 1 fi +# There are a couple of unresolved issues with nvidia-installer, so we +# abort if an Nvidia driver is still installed: +if [ -x /usr/bin/nvidia-installer ]; then + echo -e "\n A previous Nvidia installation has been detected!" + echo -e " Please remove the installed driver and rerun this script.\n" + exit 1 +fi + SRCNAM=NVIDIA-Linux-$TARGET-${VERSION} # make a clean package directory tree @@ -67,8 +76,8 @@ 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,sbin} \ $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/nvidia/{32,64} \ + $PKG/usr/include/GL $PKG/etc/vulkan/{icd.d,implicit_layer.d} $PKG/etc/X11/xorg.conf.d \ + $PKG/etc/X11/glvnd/egl_vendor.d if [ "$COMPAT32" = "yes" ]; then mkdir -p $PKG/usr/lib/tls @@ -82,10 +91,8 @@ rm -rf nvidia-settings-$VERSION tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2 rm -rf nvidia-xconfig-$VERSION tar xvf $CWD/nvidia-xconfig-$VERSION.tar.bz2 -rm -rf nvidia-modprobe-$VERSION.tar.bz2 +rm -rf nvidia-modprobe-$VERSION tar xvf $CWD/nvidia-modprobe-$VERSION.tar.bz2 -rm -rf nvidia-persistenced-$VERSION.tar.bz2 -tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2 sh $CWD/$SRCNAM.run --extract-only cd $SRCNAM chown -R root:root . @@ -97,6 +104,7 @@ find -L . \ # Compiling the various open source apps instead of using the precompiled binaries # Compiling nvidia-installer from source +if [ "$CURRENT" = "no" ]; then cd $TMP/nvidia-installer-$VERSION # Let's try to remove the conflicting files and GPU detection @@ -120,23 +128,14 @@ cd - # 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 - -# Configure options -if [ "$GLVND" = "yes" ]; then - GLVNDOPT="--install-libglvnd --glvnd-glx-client --glvnd-egl-client" -else - GLVNDOPT="--no-install-libglvnd --no-glvnd-glx-client --no-glvnd-egl-client" fi -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then + +if [ "${COMPAT32}" = "yes" ]; then COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" - MULTI="_multi" + MULTI="_multilib" else - if [ ! "$ARCH" = "x86_64" ]; then - COMP32="" - else - COMP32="--no-install-compat32-libs" - MULTI="" - fi + COMP32="--no-install-compat32-libs" + MULTI="" fi # Install the binary libs using nvidia-installer compiled above @@ -157,17 +156,42 @@ 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 \ - $GLVNDOPT \ $COMP32 -# Clean-up: we really do not need this: -rm -rf /var/lib/nvidia -# which 32-bit tls? why? why? -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION - cd $PKG/usr/lib - ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION - cd - + # 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 +mv /etc/vulkan/implicit_layer.d/nvidia_layers.json $PKG/etc/vulkan/implicit_layer.d/nvidia_layers.json +# In current, mesa now puts an entry into this directory, so we +# leave it alone if it is not empty +if [ -z "$(ls -A /etc/OpenCL/vendors)" ]; then + rm -rf /etc/OpenCL +fi +# just in case any other programs make an entry here +if [ -z "$(ls -A /etc/vulkan)" ]; then + rm -rf /etc/vulkan +fi + +if [ "$CURRENT" = "yes" ]; then +# libOpenCL.so is now included in current (in ocl-icd), +# so we don't need this one. + rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so.1.0.0 + if [ "${COMPAT32}" = "yes" ]; then + rm -f $PKG/usr/lib/libOpenCL.so.1.0.0 + fi +else +# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia +# files so we don't stomp on any overlapping xorg files. +# Note: switching can be problematic ;-) + mkdir -p $PKG/var/log/nvidia/{32,64} + install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ + sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch + sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch + if [ ${COMPAT32} = "yes" ]; then + sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch + else + sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch + fi fi # Compile utilites from source, replacing the precompiled versions @@ -229,110 +253,19 @@ cd - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" make - - install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/ +# must be installed suid root for nvidia-persistenced to work properly + install -m 4755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-modprobe.1.gz $PKG/usr/man/man1/ cd - -# Compiling nvidia-persistenced - cd $TMP/nvidia-persistenced-$VERSION - 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 -#FIXME: need rc.nvidia-persistenced script; see doc - 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/ - cd - - -# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files -# so we don't stomp on the overlapping xorg files. -# Note: switching can be problematic ;-) -install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ -sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch -sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch -if [ "$GLVND" = "yes" ]; then - sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch -else - sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch -fi -if [ ${COMPAT32} = "yes" ]; then - sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch -else - sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch -fi - -# These add or correct wrong paths -sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la +# These update the paths in nvidia-settings.desktop sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la - sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la - sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la -fi - -# rename wrong/conficting files as needed; remove conflicting symlinks created by installer -# since nvidia-switch tracks them. -cd $PKG/usr/lib$LIBDIRSUFFIX - if [ "$GLVND" = "yes" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi - mv libGL.la libGL.la-nvidia - mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia - mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia - rm -f libEGL.so - rm -f libEGL.so.1 - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGLESv1_CM.so - rm -f libGLESv1_CM.so.1 - rm -f libGLESv2.so - rm -f libGLESv2.so.1 - rm -f xorg/modules/libwfb.so -cd - - -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - cd $PKG/usr/lib - if [ "$GLVND" = "yes" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi - mv libGL.la libGL.la-nvidia - mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia - mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia - rm -f libEGL.so - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGLESv1_CM.so - rm -f libGLESv1_CM.so.1 - rm -f libGLESv2.so - rm -f libGLESv2.so.1 - 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 - -# 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 -rm -rf /etc/OpenCL -rm -rf /etc/vulkan - -# Remove xorg conf file since we take care of that in nvidia-driver +# Remove xorg conf file since we handle that in nvidia-kernel rm -rf $PKG/etc/X11/xorg.conf.d -cat <<EOF > $PKG/var/log/nvidia/README.txt -Do NOT delete this directory! -nvidia-switch will backup the original X.org libraries here. -EOF - cd $TMP/$SRCNAM # put docs in the right place mv $PKG/usr/share/man/man1/nvidia-* $PKG/usr/man/man1 @@ -344,8 +277,64 @@ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc +if [ "$COMPAT32" = "yes" ]; then + sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver: This package includes the 32-bit libraries.|" $PKG/install/slack-desc +else + sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver:|" $PKG/install/slack-desc +fi + cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Flag install as multlib as needed and build package. +# 14.2 needs nvidia-switch, -current does not +if [ "$CURRENT" = "no" ]; then + echo -e "usr/sbin/nvidia-switch --install\n" >> $PKG/install/doinst.sh +fi + +# 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 +# Compiling nvidia-persistenced + cd $TMP/nvidia-persistenced-$VERSION + 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/ + + if ! getent group nvidia > /dev/null 2>&1; then + echo "Creating the group nvidia:" + groupadd -g 365 nvidia || exit 1 + fi + if ! getent passwd nvidia > /dev/null 2>&1; then + echo "Creating the user nvidia:" + useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1 + fi + mkdir -p $PKG/var/run/nvidia-persistenced + chown nvidia:nvidia $PKG/var/run/nvidia-persistenced + mkdir -p $PKG/etc/rc.d + 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 + cat <<EOF >> $PKG/install/doinst.sh +# Create group and user nvidia if they don't already exist +if ! getent group nvidia > /dev/null 2>&1; then + echo "Creating the group nvidia:" + groupadd -g 365 nvidia || exit 1 +fi +if ! getent passwd nvidia > /dev/null 2>&1; then + echo "Creating the user nvidia:" + useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1 +fi + +EOF +fi + +# Flag multlib as needed and build package. cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz} |