diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 23:40:11 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 23:40:11 +0000 |
commit | b55bff9605590733a6623fada4c6ab95dffd48ba (patch) | |
tree | 55967a10ee8ff20dcff4d90ae2d1e995a23b4bd2 /lib/MGA/DrakISO/BuildISO.pm | |
parent | 1fb7342916768c078edf6ce9bcac7bfd88bdfee0 (diff) | |
download | drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar.gz drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar.bz2 drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar.xz drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.zip |
Simplify build directory structure.
Diffstat (limited to 'lib/MGA/DrakISO/BuildISO.pm')
-rwxr-xr-x | lib/MGA/DrakISO/BuildISO.pm | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm index 469662f..8771939 100755 --- a/lib/MGA/DrakISO/BuildISO.pm +++ b/lib/MGA/DrakISO/BuildISO.pm @@ -47,11 +47,8 @@ our @EXPORT = qw(build_iso); sub build_iso { my ($build) = @_; - my $arch = $build->{settings}{arch}; - - my $arch_dir = $build->get_builddir($arch); - my $dosutils = $build->get_builddir('dosutils'); my $loopbacks = $build->get_builddir('loopbacks'); + my $files = $build->get_builddir('files'); build_iso_image( $build, @@ -59,21 +56,15 @@ sub build_iso { if_($build->{settings}{arch} eq 'x86_64', '/EFI=' . $build->get_builddir('EFI'), ), - if_(-d $dosutils, - "dosutils=" . $dosutils, - ), - if_(-d $arch_dir, - "$arch=" . $arch_dir, - ), if_(-d $loopbacks, map { '/loopbacks' . $_ . '=' . $loopbacks . $_; } list_selected_loopbacks($build) ), - if_($build->{media}{files}, + if_(-d $files, map { - $_ . '=' . $build->get_builddir('files') . '/' . $_; - } all($build->get_builddir('files')) + $_ . '=' . $files . '/' . $_; + } all($files) ), ); } |