diff options
| author | Anne Nicolas <ennael@mageia.org> | 2011-11-11 19:50:19 +0000 |
|---|---|---|
| committer | Anne Nicolas <ennael@mageia.org> | 2011-11-11 19:50:19 +0000 |
| commit | 5868b690a1dd84b5a5ed079c917a845910844890 (patch) | |
| tree | 52015d0f42b42f55fa3cc1e4effc34b08dbe3c8c | |
| parent | 28002f9f8eb91a55296fc91fbe11a559132a425f (diff) | |
| download | bcd-5868b690a1dd84b5a5ed079c917a845910844890.tar bcd-5868b690a1dd84b5a5ed079c917a845910844890.tar.gz bcd-5868b690a1dd84b5a5ed079c917a845910844890.tar.bz2 bcd-5868b690a1dd84b5a5ed079c917a845910844890.tar.xz bcd-5868b690a1dd84b5a5ed079c917a845910844890.zip | |
Add support parameter in iso name
| -rw-r--r-- | BCD/Common.pm | 3 | ||||
| -rw-r--r-- | BCD/Genisoimage.pm | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/BCD/Common.pm b/BCD/Common.pm index 126c207..5b6e538 100644 --- a/BCD/Common.pm +++ b/BCD/Common.pm @@ -12,7 +12,7 @@ use BCD::Bcd qw(:DEFAULT); our @ISA = qw(Exporter); our @EXPORT = qw(create_needed_dir check_dir clean_all print_color); # export all needed var -our @EXPORT_OK = qw($isoconf $wd $name $arch $file $based_on $version $repo $isodir $builddir $distrib_path $error_color $DISTRIB $THEME $tmp_rpmsrate $NB_FORK $dir_deps @list_of_removed $rpmrc $pwd_file $conf_file $date $urpmqlogs); +our @EXPORT_OK = qw($isoconf $wd $name $arch $file $based_on $version $repo $isodir $builddir $distrib_path $error_color $DISTRIB $THEME $tmp_rpmsrate $NB_FORK $dir_deps @list_of_removed $rpmrc $pwd_file $conf_file $date $urpmqlogs $support); my $LOG="COMMON -"; my $color = "red"; @@ -46,6 +46,7 @@ our $arch = $isoconf->{arch}; our $version = $isoconf->{mediainfo}{version}; our $repo = $isoconf->{repo}{path}; our $based_on = $isoconf->{based_on}; +our $support = $isoconf->{support}; $DISTRIB or print_color("You must define the <theme><name> tag",$color) and exit 1; $THEME or print_color("You must define the <theme><theme> tag",$color) and exit 1; diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm index e5ecfe7..84546d7 100644 --- a/BCD/Genisoimage.pm +++ b/BCD/Genisoimage.pm @@ -2,7 +2,7 @@ package BCD::Genisoimage; use strict; use XML::Simple; -use BCD::Common qw(:DEFAULT $isoconf $wd $name $arch $version $builddir $isodir $error_color $repo $based_on); +use BCD::Common qw(:DEFAULT $isoconf $wd $name $arch $version $builddir $isodir $error_color $repo $based_on $support); use BCD::Media qw(:DEFAULT parse_synthesis); use URPM; @@ -14,7 +14,7 @@ my $LOG="GENISOIMAGE -"; my $color = "green"; # mandriva-linux-free-2009.1-i586 -our $isoname = $isoconf->{nameid} . '-' . $isoconf->{mediainfo}{version} . '-' . $isoconf->{arch}; +our $isoname = $isoconf->{nameid} . '-' . $isoconf->{mediainfo}{version} . '-' . $isoconf->{arch} . '-' . $isoconf->{support}; # 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 |