diff options
| author | Anne Nicolas <ennael@mageia.org> | 2014-12-08 21:49:49 +0100 |
|---|---|---|
| committer | Anne Nicolas <ennael@mageia.org> | 2014-12-08 21:49:49 +0100 |
| commit | 8ace44c8da50f1f1d643d4b0b66a941d6ee1ef51 (patch) | |
| tree | e793db6a6429c1514e82a2c0f77dbaf1f64791f0 /BCD | |
| parent | 789b34d0a0c11a9332a40d87d80cf168ddcc2680 (diff) | |
| parent | d6b229fb8d950d02db6b7cde56641ea29c003cb6 (diff) | |
| download | bcd-8ace44c8da50f1f1d643d4b0b66a941d6ee1ef51.tar bcd-8ace44c8da50f1f1d643d4b0b66a941d6ee1ef51.tar.gz bcd-8ace44c8da50f1f1d643d4b0b66a941d6ee1ef51.tar.bz2 bcd-8ace44c8da50f1f1d643d4b0b66a941d6ee1ef51.tar.xz bcd-8ace44c8da50f1f1d643d4b0b66a941d6ee1ef51.zip | |
Merge branch 'master' of git://git.mageia.org/software/build-system/bcd
Diffstat (limited to 'BCD')
| -rw-r--r-- | BCD/Genisoimage.pm | 31 | ||||
| -rw-r--r-- | BCD/Media.pm | 4 |
2 files changed, 22 insertions, 13 deletions
diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm index 197d201..f410e2d 100644 --- a/BCD/Genisoimage.pm +++ b/BCD/Genisoimage.pm @@ -83,19 +83,28 @@ sub create_idx { sub create_iso { # build the ISO with all args + # use -eltorito-alt-boot -b isolinux/efiboot.img -no-emul-boot for EFI print_color("$LOG Building the ISO", $color); + + my $boot =""; + if ($nameid eq "Mageia" && $arch eq "x86_64") { + $boot = "-boot-info-table -eltorito-alt-boot -b isolinux/efiboot.img -no-emul-boot"; + } else { + $boot = "-boot-info-table"; + } + my $cmd = "genisoimage $isoconf->{iso}{genisoimage}{options} \\ --A '$isoconf->{iso}{header}{applicationid}' \\ --publisher '$isoconf->{iso}{header}{publisherid}' \\ --sysid '$isoconf->{iso}{header}{systemid}' \\ --p '$isoconf->{iso}{header}{datapreparer}' \\ --volset '$isoconf->{iso}{header}{volumesetid}' \\ --V '$isoconf->{iso}{header}{volumeid}' \\ --o '$isodir/$isoname.iso' \\ --b isolinux/isolinux.bin \\ --boot-info-table \\ -$builddir/../ -"; + -A '$isoconf->{iso}{header}{applicationid}' \\ + -publisher '$isoconf->{iso}{header}{publisherid}' \\ + -sysid '$isoconf->{iso}{header}{systemid}' \\ + -p '$isoconf->{iso}{header}{datapreparer}' \\ + -volset '$isoconf->{iso}{header}{volumesetid}' \\ + -V '$isoconf->{iso}{header}{volumeid}' \\ + -o '$isodir/$isoname.iso' \\ + -b isolinux/isolinux.bin \\ + $boot \\ + $builddir/../ + "; #-quiet \\ print_color("\n------------\n $cmd", $color); system($cmd); diff --git a/BCD/Media.pm b/BCD/Media.pm index dfbc5f1..c39652b 100644 --- a/BCD/Media.pm +++ b/BCD/Media.pm @@ -92,8 +92,8 @@ sub use_gendistrib { system("rm -vf $builddir/media/$destmedia/media_info/MD5SUM"); } undef $destmedia; - print_color("$LOG gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir", $color); - my $cmd = "gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir"; + print_color("$LOG gendistrib --nobadrpm --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir", $color); + my $cmd = "gendistrib --nobadrpm --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir"; system($cmd) == 0 or die "$LOG system $cmd failed: $?\n"; if ($isoconf->{based_on} lt "2009.1" || $isoconf->{based_on} eq "mes5") { foreach my $media (@{$isoconf->{media}{list}}) { |