From 8571bb3cd5e1c0a433fd70bfcff2c3f6ae0f91e9 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Fri, 8 Mar 2002 15:02:04 +0000 Subject: fixed allowNVIDIA_rpms to take care of new kernel naming conventions. --- perl-install/install_any.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 73b58d189..6ca56b3ca 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -192,10 +192,12 @@ sub allowNVIDIA_rpms { if (pkgs::packageByName($packages, "NVIDIA_GLX")) { #- at this point, we can allow using NVIDIA 3D acceleration packages. my @rpms; - foreach (qw(kernel kernel-smp kernel-entreprise kernel22 kernel22-smp kernel22-secure)) { + foreach (keys %{$packages->{names}}) { + my ($ext, $version, $release) = /kernel[^-]*(-smp|-enterprise|-secure)?(?:-(\d.*?)\.(\d+mdk))?$/ or next; my $p = pkgs::packageByName($packages, $_); pkgs::packageSelectedOrInstalled($p) or next; - my $name = "NVIDIA_kernel-" . pkgs::packageVersion($p) . "-" . pkgs::packageRelease($p) . (/(-.*)/ && $1); + $version or ($version, $release) = (pkgs::packageVersion($p), pkgs::packageRelease($p)); + my $name = "NVIDIA_kernel-$version-$release$ext"; pkgs::packageByName($packages, $name) or return; push @rpms, $name; } -- cgit v1.2.1