summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-24 13:43:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-24 13:43:37 +0000
commit592266572eeb00df77afdb6ed1baa647270c1019 (patch)
treea8b0ca26d5107b82140214115495874abe707ef5
parent8328ef6952f4928c9def04098042d69732373671 (diff)
downloaddrakx-592266572eeb00df77afdb6ed1baa647270c1019.tar
drakx-592266572eeb00df77afdb6ed1baa647270c1019.tar.gz
drakx-592266572eeb00df77afdb6ed1baa647270c1019.tar.bz2
drakx-592266572eeb00df77afdb6ed1baa647270c1019.tar.xz
drakx-592266572eeb00df77afdb6ed1baa647270c1019.zip
- install NVIDIA_nforce-xxx
- /usr/lib/libGL.so.1 links to /etc/X11/libGL.so.1 - create /usr/lib/libGL.so.1.fglrx and /usr/lib/libGL.so.1.nvidia => at runtime we create /etc/X11/libGL.so.1 linked to one of them
-rwxr-xr-xmove/make_live21
1 files changed, 17 insertions, 4 deletions
diff --git a/move/make_live b/move/make_live
index 8a9cf5eb9..19e7d21bf 100755
--- a/move/make_live
+++ b/move/make_live
@@ -40,7 +40,7 @@ sub installPackages {
qw(zcip dhcp-client dhcpcd ppp kdenetwork-kppp rp-pppoe pptp-adsl speedtouch speedtouch_mgmt nfs-utils-clients samba-client tmdns wireless-tools adiusbadsl), #- network conf
qw(cups cups-drivers foomatic-db gimpprint hpoj libnet-snmp mtools mtoolsfm nmap printer-filters printer-testpages printer-utils scli xojpanel xpp), #- printer stuff
qw(ATI_GLX NVIDIA_GLX),
- qw(hcfpcimodem hsflinmodem ltmodem),
+ qw(hcfpcimodem hsflinmodem ltmodem NVIDIA_nforce-2.4.22.21mdk),
qw(xinput), #- for some mice
qw(perl-Term-Readline-Gnu), #- allow debugging move
],
@@ -63,6 +63,21 @@ sub installPackages {
rename "/etc/rpm/macros.", "/etc/rpm/macros";
}
+sub config_X_proprietary_drivers {
+ unlink "$::prefix/usr/lib/libGL.so";
+
+ my %name_to_Driver = (NVIDIA_GLX => 'nvidia', ATI_GLX => 'fglrx');
+
+ my $lib = 'libGL.so.1';
+ symlinkf("/etc/X11/$lib", "$::prefix/usr/lib/$lib");
+ foreach (keys %name_to_Driver) {
+ my ($full_name) = run_program::rooted_get_stdout($::prefix, 'rpm', '-ql', $_) =~ m!/usr/lib/(\Q$lib\E\..*)! or die '';
+ symlinkf($full_name, "$::prefix/usr/lib/$lib.$name_to_Driver{$_}");
+ }
+ #- remove the dirty hack done by NVIDIA_kernel-xxx proprietary package
+ #- we do it by hand when needed
+ substInFile { $_ = '' if /^nvidia$/ } "$::prefix/etc/modules";
+}
my $cwd = chomp_(`pwd`);
$::prefix = $ARGV[0] || '/tmp/live_tree';
print "Making live in $::prefix directory.\n";
@@ -80,9 +95,7 @@ print "Making live in $::prefix directory.\n";
run_program::rooted($::prefix, 'kbuildsycoca', '--global');
eval { rm_rf("$::prefix/lib/i686") }; # de-complexify, use the default on any arch
- #- remove the dirty hack done by NVIDIA_kernel-xxx proprietary package
- #- we do it by hand when needed
- substInFile { $_ = '' if /^nvidia$/ } "$::prefix/etc/modules";
+ config_X_proprietary_drivers();
unlink "$::prefix/usr/share/autostart/$_.desktop" foreach 'klipper', 'korgac', 'kalarmd.autostart';
}