From b55bff9605590733a6623fada4c6ab95dffd48ba Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 22 Dec 2017 23:40:11 +0000
Subject: Simplify build directory structure.

---
 lib/MGA/DrakISO/BuildClassic.pm |  8 ++++----
 lib/MGA/DrakISO/BuildISO.pm     | 17 ++++-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'lib/MGA/DrakISO')

diff --git a/lib/MGA/DrakISO/BuildClassic.pm b/lib/MGA/DrakISO/BuildClassic.pm
index 86eaebd..b276a71 100755
--- a/lib/MGA/DrakISO/BuildClassic.pm
+++ b/lib/MGA/DrakISO/BuildClassic.pm
@@ -99,10 +99,10 @@ sub prepare_files {
     my $version = $build->{settings}{version};
     my $tag     = $build->{settings}{tag};
 
-    my $files_dir = $build->get_builddir('files') . '/';
+    my $arch_dir = $build->get_builddir('files') . '/' . $arch;
 
-    create_product_id($build, $files_dir . $arch . '/product.id');
-    create_index($build, $files_dir . $arch . '/pkg-' . $version . '-' . $tag . '.idx');
+    create_product_id($build, $arch_dir . '/product.id');
+    create_index($build, $arch_dir . '/pkg-' . $version . '-' . $tag . '.idx');
 }
 
 ###############################################################################
@@ -474,7 +474,7 @@ sub build_installer_media {
 
     # Create a clean set of media directories
     my $arch = $build->{settings}{arch};
-    my $arch_dir = $build->get_builddir($arch);
+    my $arch_dir = $build->get_builddir('files') . '/' . $arch;
     my $media_dir = $arch_dir . '/media/';
     rm_rf($media_dir) if -e $media_dir;
     mkdir_p($media_dir . 'media_info');
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)
         ),
     );
 }
-- 
cgit v1.2.1