From 24918bbe44801255f493558997578f996404a62f Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 22 Oct 2022 22:22:17 +0100
Subject: Remove/replace obsolete packages.

---
 config/build.cfg | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config/build.cfg b/config/build.cfg
index 822e23b..988f091 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -73,7 +73,7 @@ my $config = {
 
             # Some extra admin tools.
             'bind-utils', 'dmraid', 'gparted', 'hdparm',
-            'manatools', 'mc', 'mdadm', 'vim-enhanced',
+            'mc', 'mdadm', 'vim-enhanced',
 
             # Some extra backup and recovery tools.
             'clonezilla', 'extundelete', 'fsarchiver', 'photorec', 'testdisk',
@@ -154,9 +154,6 @@ my $config = {
             'efax',
             'nvidia-nsight',
 
-            # Not yet ready.
-            'manatools-gui',
-
             if_($has_gnome,
                 'gnome-builder',
                 'gnome-boxes', # Conflicts with task-printing
@@ -184,8 +181,8 @@ my $config = {
 
             # nonfree
             'dkms-broadcom-wl',
-            'dkms-nvidia390', 'x11-driver-video-nvidia390',
             if_($arch eq 'x86_64',
+                'dkms-nvidia470', 'x11-driver-video-nvidia470', 'nvidia470-utils',
                 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', 'nvidia-current-utils',
             ),
         ],
@@ -202,10 +199,9 @@ my $config = {
 
         disable_services => [
             # Uncommon hardware.
-            qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd),
+            qw(bpalogin cpqarrayd mdadm oki4daemon pcscd),
             # Unneeded software.
             qw(chronyd snmpd),
-            if_($has_gnome, qw(ntpd)),
             # Slows down basic usage and install, reenabled after install.
             qw(crond msec),
         ],
@@ -322,7 +318,7 @@ my $config = {
             ),
 
             # Fix permissions for copied files.
-            "chown -R $default_user.$default_user /home/$default_user",
+            "chown -R $default_user:$default_user /home/$default_user",
 
             # Set default user name for draklive-install.
             "echo $default_user > /etc/draklive-install.d/user",
@@ -381,7 +377,7 @@ my $config = {
             ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot xclone=1' },
             'Install Mageia Live'                             => { append => $default_append . ' noxconf xdriver=free install' },
             ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot xclone=1 install' },
-            'Memory Test'                                     => { command => 'linux32', image  => '/boot/pcmemtest', initrd => 'none' },
+            'Memory Test'                                     => { command => 'linux32', image  => '/boot/memtest', initrd => 'none' },
         ],
         mbr_boot_img        => 'bootloader/images/boot_hybrid.img',
         eltorito_img        => 'bootloader/images/eltorito.img',
@@ -399,7 +395,7 @@ my $config = {
         copy_from_repo => [
             'autorun.inf'        => 'files/autorun.inf',
             'dosutils'           => 'files/dosutils',
-            'isolinux/memtest'   => "boot/pcmemtest",
+            'isolinux/memtest'   => "boot/memtest",
         ],
         checksums           => [ qw(md5 sha2 sha3) ],
     },
-- 
cgit v1.2.1