diff options
Diffstat (limited to 'BCD/Media.pm')
| -rw-r--r-- | BCD/Media.pm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/BCD/Media.pm b/BCD/Media.pm index b1b3937..7f6e7a2 100644 --- a/BCD/Media.pm +++ b/BCD/Media.pm @@ -44,7 +44,6 @@ sub show_size { } sub list_media { - check_based_on; print_color("$LOG all media are listed there:", $color); foreach my $media (@{$isoconf->{media}{list}}) { $media->{name} or next; @@ -96,12 +95,12 @@ sub use_gendistrib { print_color("$LOG gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir", $color); my $cmd = "gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir"; system($cmd) == 0 or die "$LOG system $cmd failed: $?\n"; - if (check_based_on eq "0") { + if ($isoconf->{based_on} lt "2009.1" || $isoconf->{based_on} eq "mes5") { foreach my $media (@{$isoconf->{media}{list}}) { $media->{name} or next; if ($destmedia eq $media->{destmedia}) { next } $destmedia = $media->{destmedia}; - print_color("$LOG < 2009.1 or mes5 detected or not Mageia", $color); + print_color("$LOG < 2009.1 or mes5 detected", $color); print_color("$LOG move hdlists and synthesys from $builddir/media/$destmedia/media_info to $builddir/media/media_info/", $color); system("rm -vf $builddir/media/media_info/*_$media->{name}.cz"); # system("rm -vf $builddir/media/media_info/*_main.cz"); @@ -129,7 +128,8 @@ sub create_mediacfg { print $MEDIACFG "\n"; print $MEDIACFG "[media_info]\n"; print $MEDIACFG "version=$version\n"; - if (check_based_on eq "1") { + if ($isoconf->{based_on} gt "2009.1" && $isoconf->{based_on} ne "mes5") { + print_color("$LOG > 2009.1 or not a mes5 product", $color); print $MEDIACFG "mediacfg_version=2\n"; } print $MEDIACFG "branch=$isoconf->{iso}{branch}\n"; @@ -150,14 +150,15 @@ sub create_mediacfg { $media->{name} or next; if ($destmedia eq $media->{destmedia}) { next } $destmedia = $media->{destmedia}; - if (check_based_on eq "0") { + if ($isoconf->{based_on} =~ "mes5" || $isoconf->{based_on} lt "2009.1") { + print_color("$LOG < 2009.1 or mes5 detected", $color); print $MEDIACFG " [$media->{destmedia}] hdlist=hdlist_$media->{name}.cz pubkey=pubkey_$media->{name} -name=$media->{name} -desc=$media->{desc} +name=$isoconf->{iso}{header}{volumesetid} +desc=$isoconf->{iso}{header}{volumesetid} \n"; } else { print $MEDIACFG " @@ -838,7 +839,7 @@ sub use_genhdlist2 { sub remove_hdlist { my $destmedia; - if (check_based_on eq "1") { + if ($isoconf->{based_on} gt "2009.1" or $isoconf->{based_on} != "mes5") { print_color("$LOG remove hdlists*.cz from $builddir/media/media_info", $color); system("rm -vf $builddir/media/media_info/hdlist*.cz"); foreach my $media (@{$isoconf->{media}{list}}) { |