diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/ChangeLog | 7 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 3 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 9b5bc04c3..be0eaae74 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,10 @@ +2000-09-27 François Pons <fpons@mandrakesoft.com> + + * Xconfigurator.pm: added option "sw_cursor" for S3 Trio3D. fixed + 3D hw acceleration for i815 (VideoRam) + * pkgs.pm: added function allowedToUpgrade to filter kernel + package. + 2000-09-27 DrakX <install@linux-mandrake.com> * snapshot uploaded diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index d5eedcca1..f5f5abb82 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -285,6 +285,7 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . " }; -x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})"; + $card->{options}{sw_cursor} = 1 if $card->{type} =~ /S3 Trio3D/; unless ($card->{type}) { $card->{flags}{noclockprobe} = member($card->{server}, qw(I128 S3 S3V Mach64)); } @@ -311,7 +312,7 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . " #- but for some there is a need to specify VideoRam (else it won't run). if ($card->{DRI_glx}) { $card->{identifier} =~ /Matrox.* G[24]00/ and $card->{flags}{needVideoRam} = 'fakeVideoRam'; - $card->{type} =~ /Intel 810/ and ($card->{flags}{needVideoRam}, $card->{memory}) = ('fakeVideoRam', 16384); + $card->{identifier} =~ /8281[05].* CGC/ and ($card->{flags}{needVideoRam}, $card->{memory}) = ('fakeVideoRam', 16384); } if (!$::isStandalone && $card->{driver} eq 'i810') { diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index a5b063dfd..f489db953 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -1001,6 +1001,8 @@ sub selectPackagesToUpgrade($$$;$$) { @{$toRemove || []} = keys %toRemove; } +sub allowedToUpgrade { $_[0] !~ /^(kernel|kernel-secure|kernel-smp|kernel-linus|hackkernel)$/ } + sub installCallback { my $msg = shift; log::l($msg .": ". join(',', @_)); @@ -1136,7 +1138,7 @@ sub install($$$;$$) { my $trans = c::rpmtransCreateSet($db, $prefix); log::l("opened rpm database for transaction of ". scalar @transToInstall ." new packages, still $nb after that to do"); - c::rpmtransAddPackage($trans, $_->{header}, packageName($_), $isUpgrade && packageName($_) !~ /kernel/) #- TODO: replace `named kernel' by `provides kernel' + c::rpmtransAddPackage($trans, $_->{header}, packageName($_), $isUpgrade && allowedToUpgrade(packageName($_))) foreach @transToInstall; c::rpmdepOrder($trans) or @@ -1205,7 +1207,7 @@ sub remove($$) { foreach my $p (@$toRemove) { #- stuff remove all packages that matches $p, not a problem since $p has name-version-release format. - c::rpmtransRemovePackages($db, $trans, $p) if $p !~ /kernel/; + c::rpmtransRemovePackages($db, $trans, $p) if allowedToUpgrade($p); } eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo"; |