From 5868b690a1dd84b5a5ed079c917a845910844890 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Fri, 11 Nov 2011 19:50:19 +0000
Subject: Add support parameter in iso name

---
 BCD/Common.pm      | 3 ++-
 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
 
-- 
cgit v1.2.1