diff options
| -rw-r--r-- | config/build.cfg | 39 | ||||
| -rwxr-xr-x | update_bootloader_files.sh | 2 |
2 files changed, 17 insertions, 24 deletions
diff --git a/config/build.cfg b/config/build.cfg index dde4a34..012cf4e 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -1,7 +1,3 @@ -#!/usr/bin/perl -cw - -use MDK::Common; - sub build_label { my ($build) = @_; @@ -19,7 +15,7 @@ my $arch = $build->{settings}{arch}; # This is only needed for finding the boot images in the isolinux directory. my $arch2 = $arch eq 'i586' ? 'i386' : $arch; -my $_c = { +my $config = { repo => { classes => [ qw(core nonfree) ], types => [ qw(release updates) ], @@ -40,32 +36,15 @@ my $_c = { 'config/pkg-exclude.lst', 'config/pkg-exclude-to-review.lst', ], - copy_from_repo => [ - 'autorun.inf' => 'files/autorun.inf', - 'dosutils' => 'files/dosutils', - "isolinux/$arch2/all.rdz" => "boot/all.rdz", - "isolinux/$arch2/vmlinuz" => "boot/vmlinuz", - 'isolinux/memtest' => "boot/memtest", - 'doc' => "files/$arch/doc", - 'install/extra' => "files/$arch/install/extra", - 'install/stage2/mdkinst.sqfs' => "files/$arch/install/stage2/mdkinst.sqfs", - 'install/stage2/rescue.sqfs' => "files/$arch/install/stage2/rescue.sqfs", - 'install/stage2/VERSION' => "files/$arch/install/stage2/VERSION", - 'misc' => "files/$arch/misc", - 'release-notes.txt' => "files/$arch/release-notes.txt", - 'release-notes.html' => "files/$arch/release-notes.html", - ], system => { vga_mode => '791', }, media => { - storage => 'iso', label => build_label($build), bootloader_title => build_title($build), bootloader_theme => 'bootloader/maggy', bootloader_font => 'bootloader/unicode.pf2', bootloader_langs => 'bootloader/lang-names.txt', - bootloader_kbds => 'bootloader/kbd-names.txt', bootloader_messages => 'bootloader/messages', bootloader_default => 0, bootloader_timeout => 10, @@ -83,6 +62,20 @@ my $_c = { efi_type => '64bit', boot64_efi => 'bootloader/images/bootx64.efi' ), + copy_from_repo => [ + 'autorun.inf' => 'files/autorun.inf', + 'dosutils' => 'files/dosutils', + "isolinux/$arch2/all.rdz" => "boot/all.rdz", + "isolinux/$arch2/vmlinuz" => "boot/vmlinuz", + 'isolinux/memtest' => "boot/memtest", + 'doc' => "files/$arch/doc", + 'install/extra' => "files/$arch/install/extra", + 'install/stage2/mdkinst.sqfs' => "files/$arch/install/stage2/mdkinst.sqfs", + 'install/stage2/rescue.sqfs' => "files/$arch/install/stage2/rescue.sqfs", + 'install/stage2/VERSION' => "files/$arch/install/stage2/VERSION", + 'misc' => "files/$arch/misc", + 'release-notes.txt' => "files/$arch/release-notes.txt", + 'release-notes.html' => "files/$arch/release-notes.html", + ], }, - mount => MGA::DrakISO::Mounts::volatile_squash_union(0), }; diff --git a/update_bootloader_files.sh b/update_bootloader_files.sh index 4e7b2e8..7655012 100755 --- a/update_bootloader_files.sh +++ b/update_bootloader_files.sh @@ -20,6 +20,6 @@ for arch in $archs; do exit 1 fi fi - cp -ru usr/share/drakiso-bootloader/* bootloader + cp -ru usr/share/drakiso/bootloader/* bootloader rm -r usr done |