diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2010-11-29 09:30:24 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2010-11-29 09:30:24 +0000 |
| commit | 17c0b79c446eee29c5172fc53bae12ab7764ee00 (patch) | |
| tree | cf9858291759b077ead0ddac633eb92081f295f1 /BCD | |
| parent | 6e1ccca3719318b4dc14023b864f4195477ec285 (diff) | |
| download | bcd-17c0b79c446eee29c5172fc53bae12ab7764ee00.tar bcd-17c0b79c446eee29c5172fc53bae12ab7764ee00.tar.gz bcd-17c0b79c446eee29c5172fc53bae12ab7764ee00.tar.bz2 bcd-17c0b79c446eee29c5172fc53bae12ab7764ee00.tar.xz bcd-17c0b79c446eee29c5172fc53bae12ab7764ee00.zip | |
export , use fatfirst option for isohybrid
Diffstat (limited to 'BCD')
| -rw-r--r-- | BCD/Genisoimage.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm index 9a7ab57..7dba9b1 100644 --- a/BCD/Genisoimage.pm +++ b/BCD/Genisoimage.pm @@ -6,12 +6,13 @@ use BCD::Common qw(:DEFAULT $isoconf $wd $name $arch $version $builddir $isodir our @ISA = qw(Exporter); our @EXPORT = qw(main_iso); +our @EXPORT_OK = qw($isoname); my $LOG="GENISOIMAGE -"; my $color = "green"; # mandriva-linux-free-2009.1-i586 -my $isoname = $isoconf->{nameid} . '-' . $isoconf->{mediainfo}{version} . '-' . $isoconf->{arch}; +our $isoname = $isoconf->{nameid} . '-' . $isoconf->{mediainfo}{version} . '-' . $isoconf->{arch}; # genisoimage -f -sort /home/plop/tmp/build/2009.1/11.sort -r -J -hide-rr-moved -nobak -cache-inodes -A "Mandriva Linux - 2009 Spring (Free64)" -publisher "Mandriva" -sysid "Mandriva Linux" -p "Mandriva-Linux" -volset "Mandriva Linux - 2009 Spring (Free64) - DVD x86_64 [1/1]" -V "Free-20091-x86_64" -o /home/plop/iso/2009.1/11-2009.1.iso -b x86_64/isolinux/isolinux.bin -c x86_64/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "/home/plop/build/2009.1/first/11" /home/plop/build/2009.1/11 @@ -38,7 +39,7 @@ sub create_productid { print $product_id "vendor=$isoconf->{iso}{header}{publisherid},"; print $product_id "distribution=$isoconf->{iso}{header}{systemid},"; print $product_id "type=$isoconf->{iso}{type},"; - print $product_id "version=$version,"; + print $product_id "version=$isoconf->{based_on},"; print $product_id "branch=$isoconf->{iso}{branch},"; print $product_id "release=$isoconf->{iso}{minor}.$isoconf->{iso}{subversion},"; print $product_id "arch=$arch,"; @@ -49,7 +50,7 @@ sub create_productid { sub create_idx { print_color("$LOG create the IDX file from $builddir/pkg-$version-$isoconf->{iso}{tag}.idx", $color); # pkg-2009.1-pauillac.idx - system("find $builddir -name \*.rpm | awk -F 'media' {'print \"$isoconf->{iso}{header}{volumeid} \" \$2'} | sed -e 's/\.rpm\$//g' | sort > $builddir/pkg-$version-$isoconf->{iso}{tag}.idx"); + system("find $builddir -name \*.rpm | awk -F 'media/' {'print \"$isoconf->{iso}{header}{volumeid} \" \$2'} | sed -e 's/\.rpm\$//g' | sort > $builddir/pkg-$version-$isoconf->{iso}{tag}.idx"); system("cp -v $builddir/pkg-$version-$isoconf->{iso}{tag}.idx $isodir/$isoname.idx"); } @@ -94,7 +95,7 @@ sub create_md5 { sub isohybrid { print_color("$LOG isohybrid the ISO", $color); my $ISOFILE = "$isodir/$isoname.iso"; - system("isohybrid $ISOFILE") == 0 or die "$LOG system isohybrid failed: $?\n"; + system("isohybrid -fatfirst $ISOFILE") == 0 or die "$LOG system isohybrid failed: $?\n"; } sub copy_textfiles { |