diff options
Diffstat (limited to 'os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm')
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm index fc1d5124..e4c63736 100644 --- a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm +++ b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm @@ -227,22 +227,25 @@ sub installationPhase "$openslxBasePath/lib/plugins/$self->{'name'}/files"; my $installationPath = "$pluginRepoPath/"; my $binDrivers = 0; + my $engine = $self->{'os-plugin-engine'}; + - # TODO: handle it better. We know the distribution in stage1 if ($attrs->{'xserver::nvidia'} == 1 || $attrs->{'xserver::ati'} == 1 ) { copyFile("$pluginFilesPath/ubuntu-gfx-install.sh", "$installationPath"); copyFile("$pluginFilesPath/suse-gfx-install.sh", "$installationPath"); copyFile("$pluginFilesPath/ubuntu-8.10-gfx-install.sh", "$installationPath"); - #copyFile("$pluginFilesPath/linkage.sh", "$installationPath"); - # be on the safe side (BASH) - Ubuntu sets some crazy stupid 'dash' shell otherwise - #system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh clean"); - + # removeLinks is to remove Links to the files # otherwise some wrong files are created $self->removeLinks(); $binDrivers = 1; } if ($attrs->{'xserver::ati'} == 1) { + #TODO: if ($vendorOSName contains 'suse-11.1') + $engine->installPackages( + $engine->getInstallablePackagesForSelection('libstdc++33') + ); + copyFile("$pluginFilesPath/ati-install.sh", "$installationPath"); system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/ati-install.sh $vendorOSName"); #system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh ati"); |