diff options
Diffstat (limited to 'system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild')
| -rw-r--r-- | system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild | 192 |
1 files changed, 74 insertions, 118 deletions
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild index 7c3a384a1f..278a5ed9f7 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # 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 @@ -23,14 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# see changelog.txt +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-legacy390-driver -VERSION=${VERSION:-390.138} -BUILD=${BUILD:-1} +VERSION=${VERSION:-390.157} +BUILD=${BUILD:-7} TAG=${TAG:-_SBo} - -CURRENT=${CURRENT:-no} +PKGTYPE=${PKGTYPE:-tgz} set -e @@ -42,7 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,11 +67,26 @@ else COMPAT32=no fi -# 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 +if [ "$COMPAT32" = "yes" ]; then + MULTI="_multilib" +else + MULTI="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +if [ "${PERSISTENCED:-no}" = "yes" ]; then + if [ `getent group nvidia /dev/null` -o `getent passwd nvidia > /dev/null` ]; then + echo "User and/or group nvidia do not exist!" + echo "Please create user and group nvidia and rerun this script." + exit 1 + fi fi SRCNAM=NVIDIA-Linux-$TARGET-${VERSION} @@ -85,7 +98,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 @@ -108,13 +120,27 @@ 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 {} \; +# If you are building in a 32-bit chroot on 64-bit, +# this is now necessary or the utilities will not build: +export TARGET_ARCH=$TARGET + # Compiling the various open source apps instead of using the precompiled binaries # Compiling nvidia-installer from source cd $TMP/nvidia-installer-$VERSION +# First, patch for the removed sys/sysctl.h: + patch -p1 < $CWD/nvidia-installer-removed-sysctl-h.patch + # 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 + sed -i "s|/var/lib/nvidia|$PKG/var/lib/nvidia|" backup.c + sed -i "s|\"/usr/lib/\"|\"$PKG/usr/lib/\"|" files.c + sed -i "s|/usr/lib/nvidia|$PKG/usr/lib/nvidia|" misc.c + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -136,14 +162,11 @@ mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" - MULTI="_multilib" - mkdir $PKG/usr/lib else if [ ! "$ARCH" = "x86_64" ]; then COMP32="" else COMP32="--no-install-compat32-libs" - MULTI="" fi fi @@ -166,19 +189,17 @@ 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 -# 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 +# 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 $PKG/var/lib + +# if not multilib, remove the unneeded /usr/lib folder: +if [ "$ARCH" = "x86_64" -a "${COMPAT32}" != "yes" ]; then + rm -rf $PKG/usr/lib || true fi # Compile utilites from source, replacing the precompiled versions @@ -198,7 +219,7 @@ cd $TMP/nvidia-settings-$VERSION make cd ../../ - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ make install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/ @@ -252,13 +273,6 @@ mkdir -p $PKG/usr/sbin 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 [ "$CURRENT" = "no" ]; then - sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch - sed -i s/GLVERSION/1.2.0/g $PKG/usr/sbin/nvidia-switch -else - sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch - sed -i s/GLVERSION/1.7.0/g $PKG/usr/sbin/nvidia-switch -fi if [ ${COMPAT32} = "yes" ]; then sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch else @@ -266,78 +280,35 @@ else fi # These add or correct wrong paths -if [ "$CURRENT" = "no" ]; then - 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 - - 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 -fi 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 +sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop +# Remove depcrecated entry in nvidia-settings.desktop +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 - if [ "$CURRENT" = "no" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - mv libGL.la libGL.la-nvidia - mv libGL.so.1.7.0 libGL.so.1.7.0-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 libGLESv2.so - else - rm libGL.la - rm libOpenCL.so.1.0.0 - fi - rm -f xorg/modules/libwfb.so - if [ -e xorg/modules/extensions/libglx.so ]; then - (cd xorg/modules/extensions - rm libglx.so - ) - fi + rm libGL.la + rm libOpenCL.so* + rm -f xorg/modules/libwfb.so + if [ -e xorg/modules/extensions/libglx.so ]; then + rm -f xorg/modules/extensions/libglx.so + fi cd - if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - cd $PKG/usr/lib - if [ "$CURRENT" = "no" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - 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 libGLESv2.so - else - rm libGL.la - rm libOpenCL.so.1.0.0 - fi - cd - + cd $PKG/usr/lib + rm libGL.la + rm 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 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 -if [ "$CURRENT" = "no" ]; then - mkdir -p $PKG/var/log/nvidia/{32,64} - cat <<EOF > $PKG/var/log/nvidia/README.txt -Do NOT delete this directory! -nvidia-switch will backup the original X.org libraries here. -EOF -fi - cd $TMP/$SRCNAM # put docs in the right place mv $PKG/usr/share/man/man1/nvidia-* $PKG/usr/man/man1 @@ -351,13 +322,16 @@ 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|@MULTILIB@|This package includes the 32-bit compatibility libraries.|" $PKG/install/slack-desc + sed -i "s|@MULTILIB@| This package includes the 32-bit compatibility libraries.|" $PKG/install/slack-desc else sed -i "s|@MULTILIB@||" $PKG/install/slack-desc fi cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Add new douninst.sh script: +sed "s/SUFFIX/$LIBDIRSUFFIX/g" $CWD/douninst.sh > $PKG/install/douninst.sh + # Add rc.nvidia-persistenced: if [ "${PERSISTENCED:-no}" = "yes" ]; then cd $TMP @@ -365,6 +339,8 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then 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 \ @@ -375,34 +351,14 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then 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 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 - 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 + chown nvidia:nvidia $PKG/var/run/nvidia-persistenced 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} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE |