diff options
author | Jani Välimaa <wally@mageia.org> | 2024-04-28 22:31:48 +0300 |
---|---|---|
committer | Jani Välimaa <wally@mageia.org> | 2024-04-28 22:31:48 +0300 |
commit | 0bbac1035e015a51d2cb2b7281fed07ea96e95b5 (patch) | |
tree | 2daa44008b41b2c0b12bbfc5c8660f7927594021 | |
parent | 37b87119a7039ff1f8de76f4fcccbab91250f772 (diff) | |
download | drakx-0bbac1035e015a51d2cb2b7281fed07ea96e95b5.tar drakx-0bbac1035e015a51d2cb2b7281fed07ea96e95b5.tar.gz drakx-0bbac1035e015a51d2cb2b7281fed07ea96e95b5.tar.bz2 drakx-0bbac1035e015a51d2cb2b7281fed07ea96e95b5.tar.xz drakx-0bbac1035e015a51d2cb2b7281fed07ea96e95b5.zip |
perl-install: Drop i586 bits
-rw-r--r-- | perl-install/NEWS | 2 | ||||
-rw-r--r-- | perl-install/detect_devices.pm | 8 | ||||
-rw-r--r-- | perl-install/install/NEWS | 2 | ||||
-rw-r--r-- | perl-install/install/pkgs.pm | 3 |
4 files changed, 4 insertions, 11 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b3c6dfa05..a611f9748 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- Drop i586 bits + Version 18.68 - 28 April 2024 - Updated translations diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 15201a057..9aff9306c 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1420,14 +1420,6 @@ sub BIGMEM() { arch() !~ /x86_64/ && $> == 0 && dmi_detect_memory() > 4 * 1024; } -sub is_i586() { - return 0 if arch() !~ /86/; - my $cpuinfo = cat_('/proc/cpuinfo'); - $cpuinfo =~ /^cpu family\s*:\s*(\d+)/m && $1 < 6 || - $cpuinfo =~ /^model name\s*:\s*Transmeta.* TM5800/m || # mdvbz#37866 - !has_cpu_flag('cmov') || !has_cpu_flag('pae'); -} - sub is_arm_openrd_client() { to_bool(cat_('/proc/cpuinfo') =~ /OpenRD Client/); } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e300d60f2..6f94d10fc 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- Drop i586 bits + Version 18.68 - 28 April 2024 - Adapt to rpm-4.19.1 - Fix debug build diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index b095d8d41..a9692e225 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -160,8 +160,6 @@ sub _bestKernel_extensions { my ($o_match_all_hardware) = @_; $::o->{kernel_extension} ? $::o->{kernel_extension} : - $o_match_all_hardware ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') : - detect_devices::is_i586() ? '-desktop586' : _is_kernelServer_needed() ? '-server' : '-desktop'; } @@ -174,7 +172,6 @@ sub bestKernelPackage { if (!@kernels) { #- fallback on most generic kernel if the suitable one is not available - #- (only kernel-desktop586-latest is available on Dual ISO for i586) my @fallback_exts = _bestKernel_extensions('force'); @kernels = grep { $_ } map { packageByName($packages, "kernel$_-latest") } @fallback_exts; } |