diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gui/config/build.cfg | 18 | ||||
| -rw-r--r-- | examples/gui/config/settings.cfg | 4 | ||||
| -rw-r--r-- | examples/minimal/config/build.cfg | 16 | ||||
| -rw-r--r-- | examples/minimal/config/settings.cfg | 4 | ||||
| -rw-r--r-- | examples/xfce/config/build.cfg | 20 | ||||
| -rw-r--r-- | examples/xfce/config/settings.cfg | 4 |
6 files changed, 19 insertions, 47 deletions
diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg index 0710d40..dead083 100644 --- a/examples/gui/config/build.cfg +++ b/examples/gui/config/build.cfg @@ -56,11 +56,6 @@ my $config = { split(',', $build->{settings}{include_packages}) ], exclude_packages => [ - if_($arch eq 'i586', - # We want the desktop586 kernel for maximum hardware compatibility. - '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/', - ), - # No server kernels. '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/', @@ -72,11 +67,6 @@ my $config = { # them to the local repo, which means they are automatically excluded. 'grub', 'lilo', - # No distribution licence. - if_($show_licence, - 'flash-player-plugin', - ), - split(',', $build->{settings}{exclude_packages}) ], # preferred_packages => [ @@ -92,12 +82,10 @@ my $config = { 'broadcom-bcma-config', 'broadcom-ssb-config', 'dkms', - if_($arch eq 'i586', 'kernel-desktop586-devel-latest'), - if_($arch eq 'x86_64', 'kernel-desktop-devel-latest'), + 'kernel-desktop-devel-latest', # nonfree 'dkms-broadcom-wl', - 'dkms-nvidia390', 'x11-driver-video-nvidia390', if_($arch eq 'x86_64', 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', ), @@ -234,11 +222,11 @@ my $config = { if_($live_installer && $nonfree_drivers, ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' }, ), - 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' }, + 'Memory Test' => { command => 'linux', image => '/boot/memtest', initrd => 'none' }, ], mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img', eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img', - if_($arch eq 'i586', + if_($arch eq 'i686', efi_type => '32bit', boot32_efi => '/usr/share/drakiso/bootloader/images/bootia32.efi' ), diff --git a/examples/gui/config/settings.cfg b/examples/gui/config/settings.cfg index ff33880..7ac2754 100644 --- a/examples/gui/config/settings.cfg +++ b/examples/gui/config/settings.cfg @@ -2,7 +2,7 @@ vendor=Custom distro=Mageia product=Live desktop=Custom -release=8 +release=10 arch=x86_64 show_licence=no show_welcome=no @@ -10,5 +10,5 @@ live_installer=no nonfree_drivers=no include_packages= exclude_packages= -repository=http://mirrors.kernel.org/mageia/distrib/8 +repository=http://mirrors.kernel.org/mageia/distrib/10 workdir= diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg index dc78c9e..1d39eca 100644 --- a/examples/minimal/config/build.cfg +++ b/examples/minimal/config/build.cfg @@ -57,18 +57,12 @@ my $config = { 'patch', ], exclude_packages => [ - if_($arch eq 'i586', - # We want the desktop586 kernel for maximum hardware compatibility. - '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/', - ), - # No server kernels. '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/', # No proprietary drivers 'dkms-broadcom-wl', - 'dkms-nvidia390', 'x11-driver-video-nvidia390', - 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', + '/^dkms-nvidia/', '/^x11-driver-video-nvidia/', # No bootloaders. 'grub', 'grub2', 'grub2-efi', 'lilo', @@ -93,9 +87,9 @@ my $config = { disable_services => [ # Uncommon hardware. - qw(bpalogin cpqarrayd mdadm pcscd), + qw(mdadm pcscd), # Unneeded software. - qw(chronyd snmpd), + qw(chronyd), # Slows down basic usage and install, reenabled after install. qw(crond), ], @@ -168,11 +162,11 @@ my $config = { bootloader_timeout => 10, bootloader_entries => [ 'Boot Mageia Live' => { append => $default_append . ' noxconf' }, - 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' }, + 'Memory Test' => { command => 'linux', image => '/boot/memtest', initrd => 'none' }, ], mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img', eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img', - if_($arch eq 'i586', + if_($arch eq 'i686', efi_type => '32bit', boot32_efi => '/usr/share/drakiso/bootloader/images/bootia32.efi' ), diff --git a/examples/minimal/config/settings.cfg b/examples/minimal/config/settings.cfg index 9155e3e..dcbc74a 100644 --- a/examples/minimal/config/settings.cfg +++ b/examples/minimal/config/settings.cfg @@ -2,9 +2,9 @@ vendor=Custom distro=Mageia product=Live type=Minimal -release=8 +release=10 arch=x86_64 region=all default_user=live -repository=http://mirrors.kernel.org/mageia/distrib/8 +repository=http://mirrors.kernel.org/mageia/distrib/10 workdir= diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg index 00b8fda..a647272 100644 --- a/examples/xfce/config/build.cfg +++ b/examples/xfce/config/build.cfg @@ -72,20 +72,12 @@ my $config = { 'Xdialog', ], exclude_packages => [ - if_($arch eq 'i586', - # We want the desktop586 kernel for maximum hardware compatibility. - '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/', - ), - # No server kernels. '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/', # No bootloaders. The GRUB2 bootloaders are needed for install, so we add # them to the local repo, which means they are automatically excluded. 'grub', 'lilo', - - # No distribution license. - 'flash-player-plugin', ], # preferred_packages => [ # ], @@ -96,12 +88,10 @@ my $config = { 'dkms', 'efibootmgr', 'efivar', 'refind', 'grub2', 'grub2-efi', 'grub2-mageia-theme', 'os-prober', - if_($arch eq 'i586', 'kernel-desktop586-devel-latest'), - if_($arch eq 'x86_64', 'kernel-desktop-devel-latest'), + 'kernel-desktop-devel-latest', # nonfree 'dkms-broadcom-wl', - 'dkms-nvidia390', 'x11-driver-video-nvidia390', if_($arch eq 'x86_64', 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', ), @@ -128,9 +118,9 @@ my $config = { # ], disable_services => [ # Uncommon hardware. - qw(bpalogin cpqarrayd mdadm oki4daemon pcscd), + qw(mdadm oki4daemon pcscd), # Unneeded software. - qw(chronyd snmpd), + qw(chronyd), # Slows down basic usage and install, reenabled after install. qw(crond msec), ], @@ -237,11 +227,11 @@ my $config = { ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot' }, 'Install Mageia Live' => { append => $default_append . ' noxconf install' }, ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' }, - 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' }, + 'Memory Test' => { command => 'linux', image => '/boot/memtest', initrd => 'none' }, ], mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img', eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img', - if_($arch eq 'i586', + if_($arch eq 'i686', efi_type => '32bit', boot32_efi => '/usr/share/drakiso/bootloader/images/bootia32.efi' ), diff --git a/examples/xfce/config/settings.cfg b/examples/xfce/config/settings.cfg index 1d40701..0cd5001 100644 --- a/examples/xfce/config/settings.cfg +++ b/examples/xfce/config/settings.cfg @@ -2,10 +2,10 @@ vendor=Custom distro=Mageia product=Live desktop=Xfce -release=8 +release=10 arch=x86_64 region=all default_session=XfceSession default_user=live -repository=http://mirrors.kernel.org/mageia/distrib/8 +repository=http://mirrors.kernel.org/mageia/distrib/10 workdir= |