summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--NEWS11
-rw-r--r--bootloader/Makefile2
-rw-r--r--examples/gui/config/build.cfg18
-rw-r--r--examples/gui/config/settings.cfg4
-rw-r--r--examples/minimal/config/build.cfg16
-rw-r--r--examples/minimal/config/settings.cfg4
-rw-r--r--examples/xfce/config/build.cfg20
-rw-r--r--examples/xfce/config/settings.cfg4
-rw-r--r--lib/MGA/DrakISO/BuildISO.pm5
-rw-r--r--lib/MGA/DrakISO/BuildMedia.pm2
-rw-r--r--lib/MGA/DrakISO/BuildRoot.pm20
12 files changed, 48 insertions, 60 deletions
diff --git a/Makefile b/Makefile
index a6ec30b..0a22c7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
NAME = drakiso
-VERSION = 1.20
+VERSION = 1.22
all:
make -C bootloader
diff --git a/NEWS b/NEWS
index 2a5b214..d8c6a80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+1.22
+
+- add {media}{iso-level} config key to allow loopback file size > 4GB
+
+1.21
+
+- changes for Mageia 10
+ - add 'arch2' setting to identify second arch for biarch packages
+ - update examples for i586->i686 and package changes
+- translation updates
+
1.20
- translation updates
diff --git a/bootloader/Makefile b/bootloader/Makefile
index bd8f7b0..29c2059 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -6,7 +6,7 @@ GRUB2_MODULES = iso9660 ext2 fat f2fs jfs reiserfs xfs \
part_apple part_bsd part_gpt part_msdos \
all_video font gfxterm gfxmenu png \
boot chain configfile echo gettext \
- linux linux32 ls search test videoinfo
+ linux ls search test videoinfo
GRUB_IMAGES = images/boot_hybrid.img images/eltorito.img
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=
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm
index eb89965..5040f29 100644
--- a/lib/MGA/DrakISO/BuildISO.pm
+++ b/lib/MGA/DrakISO/BuildISO.pm
@@ -1,6 +1,6 @@
# Copyright (C) 2005 Mandriva
# Olivier Blin <oblin@mandriva.com>
-# Copyright (C) 2017-2018 Mageia
+# Copyright (C) 2017-2025 Mageia
# Martin Whitaker <mageia@martin-whitaker.me.uk>
#
# This program is free software; you can redistribute it and/or modify
@@ -97,6 +97,8 @@ sub build_iso_image {
my $iso_name = $build->get_name . '.iso';
+ my $iso_level = $build->{media}{iso_level} || '3';
+
my $iso_part_start = $build->{media}{iso_part_start} || 0;
$iso_part_start == 0 || $iso_part_start == 1
or die "ERROR: unsupported start sector for ISO protective partition\n";
@@ -114,6 +116,7 @@ sub build_iso_image {
run_('xorrisofs',
if_($::verbose < 2, '-quiet'),
'-pad', '-l', '-R', '-J',
+ '-iso-level', $iso_level,
'-publisher', $build->{settings}{vendor},
'-preparer', 'drakiso',
'-sysid', 'Linux',
diff --git a/lib/MGA/DrakISO/BuildMedia.pm b/lib/MGA/DrakISO/BuildMedia.pm
index 8d589b4..f59c1de 100644
--- a/lib/MGA/DrakISO/BuildMedia.pm
+++ b/lib/MGA/DrakISO/BuildMedia.pm
@@ -481,7 +481,7 @@ sub build_installer_media {
copy_or_link($src_path, $dst_path);
member($name, @{$build->{biarch_packages}}) or next;
- my $xarch = $arch eq 'x86_64' ? 'i586' : 'x86_64';
+ my $xarch = $build->{settings}{arch2};
# Here we take a shortcut, and assume the identical package exists
# for the other arch.
$src_path =~ s/$arch/$xarch/g;
diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm
index 995b419..dd978d4 100644
--- a/lib/MGA/DrakISO/BuildRoot.pm
+++ b/lib/MGA/DrakISO/BuildRoot.pm
@@ -76,7 +76,7 @@ sub install_live_system {
run_as_root('rm', '-rf', $live_root);
}
mkdir_p($live_root);
- run_as_root('chown', 'root.root', $live_root);
+ run_as_root('chown', 'root:root', $live_root);
my $Xserver_pid;
my $error_message;
@@ -114,7 +114,8 @@ sub install_live_system {
symlinkf('media/' . $arch, $chroot . '/tmp/image');
# Because the installer uses the above symlink, relative paths in
# the urpmi configuration don't work unless we add this extra link.
- symlinkf('media/i586', $chroot . '/tmp/i586') if $arch eq 'x86_64';
+ my $xarch = $build->{settings}{arch2};
+ symlinkf("media/$xarch", $chroot . "/tmp/$xarch") if $xarch;
# If the user has provided an auto-install configuration file, use it,
# otherwise construct one.
@@ -378,17 +379,18 @@ sub build_local_repo {
print "Building local repository\n" if $::verbose > 1;
- my $root = $build->get_live_root;
- my $arch = $build->{settings}{arch};
+ my $root = $build->get_live_root;
+ my $arch = $build->{settings}{arch};
+ my $xarch = $build->{settings}{arch2};
# We aren't going to run in the chroot, so we need to adjust the paths
# in the urpmi configuration.
- my $base_repository = $build->{settings}{repository};
- my $arch_repository = $base_repository . '/' . $arch;
- my $i586_repository = $base_repository . '/' . 'i586';
+ my $base_repository = $build->{settings}{repository};
+ my $arch_repository = $base_repository . '/' . $arch;
+ my $xarch_repository = $base_repository . '/' . $xarch;
run_as_root('sed', '-i', "s!/tmp/image!$arch_repository!", glob($root . '/etc/urpmi/mediacfg.d/*/url'));
run_as_root('sed', '-i', "s!/tmp/image!$arch_repository!", $root . '/etc/urpmi/urpmi.cfg');
- run_as_root('sed', '-i', "s!/tmp/i586!$i586_repository!", $root . '/etc/urpmi/urpmi.cfg') if $arch eq 'x86_64';
+ run_as_root('sed', '-i', "s!/tmp/$xarch!$xarch_repository!", $root . '/etc/urpmi/urpmi.cfg') if $xarch;
# When we pass a chroot directory to urpmi, it wants a /dev/null in
# that root.
@@ -451,7 +453,7 @@ sub build_local_repo {
$classes{$class} = 1;
member($pkg->name, @{$build->{system}{local_repo_biarch_packages}}) or next;
- my $xarch = $arch eq 'x86_64' ? 'i586' : 'x86_64';
+ my $xarch = $build->{settings}{arch2};
# Here we take a shortcut, and assume the identical package exists
# for the other arch.
$src_path =~ s/$arch/$xarch/g;
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-14 22:52:50 +0000