summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/nvidia-legacy304-kernel/10-nvidia.conf6
-rw-r--r--system/nvidia-legacy304-kernel/4.14_kernel.patch26
-rw-r--r--system/nvidia-legacy304-kernel/4.15_kernel.patch48
-rw-r--r--system/nvidia-legacy304-kernel/README12
-rw-r--r--system/nvidia-legacy304-kernel/changelog.txt18
-rw-r--r--system/nvidia-legacy304-kernel/doinst.sh3
-rw-r--r--system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild113
-rw-r--r--system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info10
-rw-r--r--system/nvidia-legacy304-kernel/slack-desc19
9 files changed, 0 insertions, 255 deletions
diff --git a/system/nvidia-legacy304-kernel/10-nvidia.conf b/system/nvidia-legacy304-kernel/10-nvidia.conf
deleted file mode 100644
index a8992c2a0d..0000000000
--- a/system/nvidia-legacy304-kernel/10-nvidia.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "Device"
- Identifier "Device0"
- Driver "nvidia"
- VendorName "Nvidia Corporation"
- BoardName ""
-EndSection
diff --git a/system/nvidia-legacy304-kernel/4.14_kernel.patch b/system/nvidia-legacy304-kernel/4.14_kernel.patch
deleted file mode 100644
index 6642189009..0000000000
--- a/system/nvidia-legacy304-kernel/4.14_kernel.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur a/kernel/nv-drm.c b/kernel/nv-drm.c
---- a/kernel/nv-drm.c 2017-09-14 23:51:09.000000003 +0300
-+++ b/kernel/nv-drm.c 2017-12-06 18:47:48.279729889 +0200
-@@ -121,7 +121,11 @@
- {
- int ret = 0;
- #if defined(NV_DRM_AVAILABLE)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- ret = drm_pci_init(&nv_drm_driver, pci_driver);
-+#else
-+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
-+#endif
- #endif
- return ret;
- }
-@@ -131,6 +135,10 @@
- )
- {
- #if defined(NV_DRM_AVAILABLE)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- drm_pci_exit(&nv_drm_driver, pci_driver);
-+#else
-+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
-+#endif
- #endif
- }
diff --git a/system/nvidia-legacy304-kernel/4.15_kernel.patch b/system/nvidia-legacy304-kernel/4.15_kernel.patch
deleted file mode 100644
index fdac62fb24..0000000000
--- a/system/nvidia-legacy304-kernel/4.15_kernel.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur a/kernel/nv.c b/kernel/nv.c
---- a/kernel/nv.c 2017-09-14 23:51:09.000000000 +0300
-+++ b/kernel/nv.c 2018-02-13 14:56:42.289490885 +0200
-@@ -301,7 +301,11 @@
- #else
- irqreturn_t nv_kern_isr(int, void *);
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
- void nv_kern_rc_timer(unsigned long);
-+#else
-+void nv_kern_rc_timer(struct timer_list *t);
-+#endif
- #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
- #endif
-@@ -2075,10 +2079,18 @@
- }
-
- void nv_kern_rc_timer(
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
- unsigned long data
-+#else
-+ struct timer_list *t
-+#endif
- )
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
- nv_linux_state_t *nvl = (nv_linux_state_t *) data;
-+#else
-+ nv_linux_state_t *nvl = from_timer(nvl, t, rc_timer);
-+#endif
- nv_state_t *nv = NV_STATE_PTR(nvl);
-
- NV_CHECK_PCI_CONFIG_SPACE(nvl->timer_sp, nv, TRUE, TRUE, FALSE);
-@@ -3029,9 +3041,13 @@
- return -1;
-
- nv_printf(NV_DBG_INFO, "NVRM: initializing rc timer\n");
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
- init_timer(&nvl->rc_timer);
- nvl->rc_timer.function = nv_kern_rc_timer;
- nvl->rc_timer.data = (unsigned long) nv;
-+#else
-+ timer_setup(&nvl->rc_timer, nv_kern_rc_timer, 0);
-+#endif
- nv->rc_timer_enabled = 1;
- mod_timer(&nvl->rc_timer, jiffies + HZ); /* set our timeout for 1 second */
- nv_printf(NV_DBG_INFO, "NVRM: rc timer initialized\n");
diff --git a/system/nvidia-legacy304-kernel/README b/system/nvidia-legacy304-kernel/README
deleted file mode 100644
index 46388555c1..0000000000
--- a/system/nvidia-legacy304-kernel/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This is the kernel-module needed by the proprietary binary nvidia driver.
-You also need the nvidia-legacy304-driver package from SlackBuilds.org.
-
-To build the package for a kernel different from the running one,
-start the script setting the KERNEL variable as in
- KERNEL=2.6.38.8 ./nvidia-legacy304-kernel.SlackBuild
-
-A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf
-to make sure that X loads the nvidia module. If you need to make changes,
-copy that file to /etc/X11/xorg.conf.d/ and edit the copy.
-
-The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-legacy304-kernel/changelog.txt b/system/nvidia-legacy304-kernel/changelog.txt
deleted file mode 100644
index b9f8fb9f01..0000000000
--- a/system/nvidia-legacy304-kernel/changelog.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-1.0 20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1 10-APR-2011 updated to new version, testing 13.37rc4.6692
-1.2 27-MAY-2011 new version, allow multilib option, minor edits
-1.2.1 20-JUN-2011 minor edits, thanks to Robby and Roberto
-1.5 01-JUL-2011 new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6 27-AUG-2011 version bump, minor edits
-1.7 21-OCT-2011 version bump
-1.8 24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W.
-1.9 02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only
-3.0 06-JUL-2013 Legacy 304 branch, removed 32-bit compatibility
-3.1 22-SEP-2013 version update
-3.1a 04-NOV-2013 minor fixes for 14.1 release
-3.2 08-FEB-2015 version update, restored 32-bit compatibility
-3.3 05-SEP-2015 version update
-3.4 13-DEC-2015 version update, X.org 1.18
-3.5 26-JUL-2016 Patched to not use deprecated kernel mtrr API in >=4.3.x kernels --rworkman
-4.0 15-FEB-2017 new version, security updates, remove disable-mtrr patch (fixed)
-4.1 21-OCT-2017 new version for recent kernels
diff --git a/system/nvidia-legacy304-kernel/doinst.sh b/system/nvidia-legacy304-kernel/doinst.sh
deleted file mode 100644
index dcfb80855f..0000000000
--- a/system/nvidia-legacy304-kernel/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-chroot . /sbin/depmod -a @KERNEL@ 2>/dev/null
-
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
deleted file mode 100644
index 3d94af4956..0000000000
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for nvidia-kernel
-
-# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2011-2017 Edward W. Koenig, Vancouver, WA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# 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-legacy304-kernel
-VERSION=${VERSION:-304.137}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-KERNEL=${KERNEL:-$(uname -r)}
-KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
-
-PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-if [ "$ARCH" = "i586" ]; then
- TARGET="x86"
- SRCSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- TARGET="x86"
- SRCSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- TARGET="x86_64"
-fi
-
-unset ARCH
-
-SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
-
-# 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-$PKGVER-$TARGET-$BUILD$TAG.$PKGTYPE"
- exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
-OUTPUT=${OUTPUT:-/tmp}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $SRCNAM
-sh $CWD/$SRCNAM.run --extract-only || exit 1
-cd $SRCNAM || exit 1
-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 {} \;
-
-# https://pkgs.rpmfusion.org/cgit/nonfree/nvidia-304xx-kmod.git/log/
-patch -p1 < $CWD/4.14_kernel.patch
-patch -p1 < $CWD/4.15_kernel.patch
-
-cd kernel || exit 1
-
-make SYSSRC=$KERNELPATH module || exit 1
-
-mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
-install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-
-# Make sure the X is specified to automagically load the
-# correct driver, since I always forget.
-
-mkdir -p $PKG/usr/share/X11/xorg.conf.d/
-cat $CWD/10-nvidia.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
deleted file mode 100644
index 6a12fea304..0000000000
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nvidia-legacy304-kernel"
-VERSION="304.137"
-HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run"
-MD5SUM="133098e70581f6b81c481338cc20f100"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run"
-MD5SUM_x86_64="a61b391d44aa6e7222f64502ef7f3ea1"
-REQUIRES=""
-MAINTAINER="unmaintained"
-EMAIL="unmaintained@gmail.com"
diff --git a/system/nvidia-legacy304-kernel/slack-desc b/system/nvidia-legacy304-kernel/slack-desc
deleted file mode 100644
index a9980b2094..0000000000
--- a/system/nvidia-legacy304-kernel/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-nvidia-legacy304-kernel: nvidia-legacy304-kernel (Kernel Interface for the nvidia driver)
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel: This is the kernel module needed by the binary nvidia-driver.
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
generated by cgit v1.2.3 (git 2.32.0) at 2024-05-26 22:12:12 +0200