diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2025-12-02 18:18:48 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2025-12-03 14:00:58 +0000 |
| commit | 03c09f5b63a46514d22695defd57420a81e39979 (patch) | |
| tree | 4f6831ba9e1cc4145eae6d9a0e45b60e8c385afb /lib/MGA/DrakISO/BuildMedia.pm | |
| parent | ebcff3893e20de5edf669e8fd14d0668826f7f65 (diff) | |
| download | drakiso-03c09f5b63a46514d22695defd57420a81e39979.tar drakiso-03c09f5b63a46514d22695defd57420a81e39979.tar.gz drakiso-03c09f5b63a46514d22695defd57420a81e39979.tar.bz2 drakiso-03c09f5b63a46514d22695defd57420a81e39979.tar.xz drakiso-03c09f5b63a46514d22695defd57420a81e39979.zip | |
Make xarch a user setting instead of calculating it from arch.
This handles the change from i586 to i686 and future-proofs it.
Diffstat (limited to 'lib/MGA/DrakISO/BuildMedia.pm')
| -rw-r--r-- | lib/MGA/DrakISO/BuildMedia.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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; |