diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-12-17 20:17:08 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-12-17 20:17:08 +0000 |
commit | b39170387f65fe3b3c111035d1df32c960207162 (patch) | |
tree | a04fd819f7139431358057a68b193686603bdc42 /lib/MGA/DrakISO/BuildRoot.pm | |
parent | 3f131c081f0cfdb4677c76d5391b0a76682307ff (diff) | |
download | drakiso-b39170387f65fe3b3c111035d1df32c960207162.tar drakiso-b39170387f65fe3b3c111035d1df32c960207162.tar.gz drakiso-b39170387f65fe3b3c111035d1df32c960207162.tar.bz2 drakiso-b39170387f65fe3b3c111035d1df32c960207162.tar.xz drakiso-b39170387f65fe3b3c111035d1df32c960207162.zip |
Add feature to support both 32 and 64 bit packages in media on the ISOs.
This can be used to support 32-bit UEFI on 64-bit systems.
Diffstat (limited to 'lib/MGA/DrakISO/BuildRoot.pm')
-rw-r--r-- | lib/MGA/DrakISO/BuildRoot.pm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm index 9e7b7ef..fe248ba 100644 --- a/lib/MGA/DrakISO/BuildRoot.pm +++ b/lib/MGA/DrakISO/BuildRoot.pm @@ -447,6 +447,15 @@ sub build_local_repo { mkdir_in_root($root, $dst_dir) if ! -d "$root$dst_dir"; copy_file_to_root($root, $dst_dir, undef, $src_path); $classes{$class} = 1; + + member($pkg->name, @{$build->{system}{local_repo_biarch_packages}}) or next; + my $xarch = $arch eq 'x86_64' ? 'i586' : 'x86_64'; + # Here we take a shortcut, and assume the identical package exists + # for the other arch. + $src_path =~ s/$arch/$xarch/g; + # This feature only exists to support 32-bit UEFI on 64-bit systems, + # so it's not worth creating a separate medium for the other arch. + copy_file_to_root($root, $dst_dir, undef, $src_path); } print "..generating media info\n" if $::verbose > 1; |