Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Sabayon/calamares-sabayon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.15
Choose a base ref
...
head repository: Sabayon/calamares-sabayon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 25, 2020

  1. Drop legacy ati-drivers support

    Daniele Rondina committed Jan 25, 2020
    Copy the full SHA
    3e42ff3 View commit details
Showing with 0 additions and 7 deletions.
  1. +0 −7 sabayon/main.py
7 changes: 0 additions & 7 deletions sabayon/main.py
Original file line number Diff line number Diff line change
@@ -213,24 +213,17 @@ def get_opengl():
xprofile = cont[-1]
if 'nvidia' in xprofile:
return 'nvidia'
elif 'ati' in xprofile:
return 'ati'
return 'xorg-x11'

bb_enabled = os.path.exists('/tmp/.bumblebee.enabled')

xorg_x11 = get_opengl() == 'xorg-x11'

if xorg_x11 and not bb_enabled:
libcalamares.utils.target_env_call(['rm', '-f', '/etc/env.d/09ati'])
libcalamares.utils.target_env_call(
['rm', '-rf', '/usr/lib/opengl/ati'])
libcalamares.utils.target_env_call(
['rm', '-rf', '/usr/lib/opengl/nvidia'])
libcalamares.utils.target_env_call(
['equo', 'rm', '--nodeps', '--norecursive', 'ati-drivers'])
libcalamares.utils.target_env_call(
['equo', 'rm', '--nodeps', '--norecursive', 'ati-userspace'])
libcalamares.utils.target_env_call(
['equo', 'rm', '--nodeps', '--norecursive', 'nvidia-settings'])
libcalamares.utils.target_env_call(