Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Nvidia 470.xx driver series #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions crapshoot
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from doflicky import OSContext
from doflicky.driver.nvidia import DriverBundleNvidia
from doflicky.driver.nvidia import DriverBundleNvidia470
from doflicky.driver.broadcom import DriverBundleBroadcom
import pisi
from pisi.db.installdb import InstallDB
Expand All @@ -29,7 +28,6 @@ class BundleSet:
def __init__(self):
""" Initialise the potential driver bundle set """
self.drivers = [
DriverBundleNvidia470(),
DriverBundleNvidia(),
DriverBundleBroadcom(),
]
Expand Down
2 changes: 0 additions & 2 deletions doflicky/bundleset.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from doflicky import OSContext
from doflicky.driver.nvidia import DriverBundleNvidia
from doflicky.driver.nvidia import DriverBundleNvidia470
from doflicky.driver.broadcom import DriverBundleBroadcom
from pisi.db.installdb import InstallDB

Expand All @@ -29,7 +28,6 @@ class BundleSet:
def __init__(self):
""" Initialise the potential driver bundle set """
self.drivers = [
DriverBundleNvidia470(),
DriverBundleNvidia(),
DriverBundleBroadcom(),
]
Expand Down
3 changes: 1 addition & 2 deletions doflicky/detection.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ def is_present(self):
return False


nvidia_driver_priority = ['nvidia-glx-driver',
'nvidia-470-glx-driver']
nvidia_driver_priority = ['nvidia-glx-driver']


def detect_hardware_packages():
Expand Down
23 changes: 0 additions & 23 deletions doflicky/driver/nvidia.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,3 @@ def get_packages(self, context, emul32=False):
else:
basePackages.append("nvidia-glx-driver")
return basePackages

class DriverBundleNvidia470(DriverBundleNvidiaBase):
""" NVIDIA driver 470 (nvidia-470-glx-driver) """

def __init__(self):
DriverBundleNvidiaBase.__init__(self,
"nvidia-470-glx-driver.modaliases")

def get_name(self):
return "NVIDIA Graphics Driver (470.xx series)"

def get_priority(self):
return 2

def get_packages(self, context, emul32=False):
basePackages = ["nvidia-470-glx-driver-common"]
if emul32:
basePackages.append("nvidia-470-glx-driver-32bit")
if context.get_active_kernel_series() == "current":
basePackages.append("nvidia-470-glx-driver-current")
else:
basePackages.append("nvidia-470-glx-driver")
return basePackages