From b5679c5f88c2fe0a2db749ca6ad65291a31087e3 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Tue, 6 Mar 2012 21:41:08 +0000 Subject: Mageia 2 Beta 1 release --- BCD/Bcd.pm | 5 +-- BCD/Common.pm | 16 +--------- BCD/Genisoimage.pm | 4 +-- BCD/Isolinux.pm | 8 ++--- BCD/Media.pm | 17 +++++----- BCD/Resign.pm | 8 ++--- BCD/Stagex.pm | 2 +- BCD/Web.pm | 11 +++---- create_dual.sh | 91 ++++------------------------------------------------- doc/howto_bcd.pdf | Bin 133558 -> 133135 bytes dual.xml | 14 ++++----- dual64.xml | 12 +++---- dvd_free32.xml | 8 ++--- dvd_free64.xml | 11 ++++--- lists/exclude | 7 +++-- lists/input_cat | 10 +++--- lists/kernel32 | 5 ++- lists/kernel64 | 3 ++ 18 files changed, 76 insertions(+), 156 deletions(-) diff --git a/BCD/Bcd.pm b/BCD/Bcd.pm index cc65737..37cd898 100644 --- a/BCD/Bcd.pm +++ b/BCD/Bcd.pm @@ -11,6 +11,7 @@ use BCD::Common qw(:DEFAULT $wd $isoconf $name $arch $version $isodir $builddir use BCD::Genisoimage; use BCD::Isolinux; use BCD::Stagex; +use BCD::CheckMedia; use BCD::Media; use BCD::Web; @@ -48,6 +49,7 @@ sub show_info { print "\n"; } + sub main_bcd() { my %opts = ( '' => \&help_bcd, @@ -63,8 +65,7 @@ sub main_bcd() { list => \&list_media, mediarepo => \&list_medias_available, checkrepo => \&check_repo_hdlist, - rpmcheck => \&rpmcheck_launch, - smartcheck => \&smartcheck_launch, + check => \&check_launch, doble => \&solve_doble_issue, kernel => \&find_all_kernel, resign => \&resign_media, diff --git a/BCD/Common.pm b/BCD/Common.pm index 9804eed..d0ab23a 100644 --- a/BCD/Common.pm +++ b/BCD/Common.pm @@ -11,7 +11,7 @@ use File::Glob ':glob'; use BCD::Bcd qw(:DEFAULT); our @ISA = qw(Exporter); -our @EXPORT = qw(create_needed_dir check_dir clean_all print_color check_based_on); +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 $rpmcheck_list_pkg $file_rpmcheck_log $smartcheck_list_pkg $smartcheck_dir $file_smartcheck_log $chroot_path $support); @@ -132,20 +132,6 @@ sub check_dir { create_needed_dir("/tmp/$isoconf->{nameid}-$version-$isoconf->{arch}"); } -sub check_based_on { - if ($isoconf->{based_on} eq "1" || $isoconf->{based_on} =~ "gauldron") { - # dedicated line for MGA - print_color("Mageia distribution", $color); - return 1; - } elsif ($isoconf->{based_on} gt "2009.1" || $isoconf->{based_on} ne "mes5") { - print_color("distribution > 2009.1 or not a MES5", $color); - return 1; - } else { - print_color("distribution < 2009.1 or MES5", $color); - return 0; - } -} - sub clean_all { my @l = glob("/tmp/$isoconf->{nameid}-$version-$isoconf->{arch}/$distrib_path/*"); foreach (@l) { diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm index 84546d7..bf2f797 100644 --- a/BCD/Genisoimage.pm +++ b/BCD/Genisoimage.pm @@ -61,7 +61,7 @@ sub create_idx { foreach (@hdlists) { print_color("$LOG parsing $_ hslist", $color); $urpm->parse_hdlist($_); - $urpm->traverse( sub { + $urpm->traverse(sub { my $pkg = shift; my $pkgname = $pkg->name; my $version = $pkg->version; @@ -122,7 +122,7 @@ sub create_md5 { sub isohybrid { print_color("$LOG isohybrid the ISO", $color); my $ISOFILE = "$isodir/$isoname.iso"; -# system("isohybrid $iso->{options}{isohybrid} $ISOFILE") == 0 or die "$LOG system isohybrid failed: $?\n"; + system("isohybrid $isoconf->{options}{isohybrid} $ISOFILE") == 0 or die "$LOG system isohybrid failed: $?\n"; } sub copy_textfiles { diff --git a/BCD/Isolinux.pm b/BCD/Isolinux.pm index 0f17dd1..fa1ef50 100644 --- a/BCD/Isolinux.pm +++ b/BCD/Isolinux.pm @@ -50,15 +50,15 @@ sub add_entry { sub use_firmware { print_color("$LOG copy fw.gz to $build_isolinux_dir/alt0/", $color); my $syslinuxcfg = "$build_isolinux_dir/isolinux.cfg"; - open (IN, "+<$syslinuxcfg"); + open(IN, "+<$syslinuxcfg"); @file = ; seek IN,0,0; - foreach (@file){ - $_ =~ s|alt0/all.rdz|alt0/all.rdz,alt0/fw.gz|g; + foreach (@file) { + s|alt0/all.rdz|alt0/all.rdz,alt0/fw.gz|g; print IN $_; } close IN; - system("cp -v /usr/lib*/drakx-installer-images/isolinux/alt0/fw.gz $build_isolinux_dir/alt0/") + system("cp -v /usr/lib*/drakx-installer-images/isolinux/alt0/fw.gz $build_isolinux_dir/alt0/"); } sub copy_files { 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}}) { diff --git a/BCD/Resign.pm b/BCD/Resign.pm index b6cc001..2dc9e94 100644 --- a/BCD/Resign.pm +++ b/BCD/Resign.pm @@ -21,7 +21,7 @@ if (defined $pwd_file) { } sub print_info { - map { if (!-f $pwd_file) { print_color("$LOG I cant find $_ file, i cant sign packages...", $color); } } $rpmrc, $pwd_file; + map { if (!-f $pwd_file) { print_color("$LOG I cant find $_ file, i cant sign packages...", $color) } } $rpmrc, $pwd_file; print_color("$LOG i will resign using info in those files: $rpmrc $pwd_file", $color); } @@ -30,7 +30,7 @@ sub resign_media { my $pm = new Parallel::ForkManager($NB_FORK); my @list_path; my @checked; my $already_done; foreach my $media (@{$isoconf->{media}{list}}) { - foreach (@checked) { $_ or next ; $media->{destmedia} =~ /^$_$/ and $already_done = 1; }; + foreach (@checked) { $_ or next; $media->{destmedia} =~ /^$_$/ and $already_done = 1 } $already_done and next; push @checked, $media->{destmedia}; push @list_path, $media->{destmedia}; @@ -49,9 +49,9 @@ sub resign_media { print("$basename_pkg ($status/$count)\n"); my $command = Expect->spawn("LC_ALL=C rpm --rcfile=$rpmrc --resign $pkg") or die "Couldn't start rpm: $!\n"; $command->log_stdout($verbose); - $command->expect(20, -re, 'Enter pass phrase:' => sub { print $command $password; }); + $command->expect(20, '-re', 'Enter pass phrase:' => sub { print $command $password }); $command->expect(undef); - $command->soft_close(); + $command->soft_close; $pm->finish; } print_color("Waiting for the end of some signature...", $color); diff --git a/BCD/Stagex.pm b/BCD/Stagex.pm index ed9bd2d..7b6d2fb 100644 --- a/BCD/Stagex.pm +++ b/BCD/Stagex.pm @@ -63,7 +63,7 @@ sub copy_misc { if (-d "$repo/$based_on/$arch/misc") { system("rm -rf $builddir/misc && mkdir $builddir/misc"); system("cp -a $repo/$based_on/$arch/misc/drakx-in-chroot $builddir/misc/"); - system("cp -a $repo/$based_on/$arch/misc/mdkinst_stage2_tooldosutils $builddir/misc/"); + system("cp -a $repo/$based_on/$arch/misc/mdkinst_stage2_tool $builddir/misc/"); } else { print_color("$LOG FAILED copy of misc directory from $repo/$based_on/$arch", $error_color); } diff --git a/BCD/Web.pm b/BCD/Web.pm index 70cf501..7d1436b 100644 --- a/BCD/Web.pm +++ b/BCD/Web.pm @@ -1,13 +1,12 @@ package BCD::Web; use strict; -use BCD::Media qw($rpmcheck_list_pkg $file_rpmcheck_log); use BCD::Genisoimage qw($isoname); use URPM; use File::Slurp; use MDK::Common; -use BCD::Common qw(:DEFAULT $isoconf $isodir $wd $arch $version $based_on $repo $THEME $name $conf_file $date $urpmqlogs); +use BCD::Common qw(:DEFAULT $isoconf $isodir $wd $arch $version $based_on $repo $THEME $name $conf_file $date $urpmqlogs $rpmcheck_list_pkg $file_rpmcheck_log $smartcheck_list_pkg $file_smartcheck_log); our @ISA = qw(Exporter); our @EXPORT = qw(main_html); @@ -20,7 +19,7 @@ my $index = $isoconf->{nameid} . '-' . $isoconf->{mediainfo}{version} . '-' . $i my $public_html = "~/public_html"; my $webdir = "$public_html/$isoname-$date"; -map { !-d "$webdir/$_" and system("mkdir -p $webdir/$_"); } qw(log rpmcheck input iso); +map { !-d "$webdir/$_" and system("mkdir -p $webdir/$_") } qw(log rpmcheck input iso); sub main_html { #next_build_info; @@ -44,7 +43,7 @@ sub show_general_info { my $date_repo; if (-f "$repo/$based_on/$arch/VERSION") { $date_repo = read_file("$repo/$based_on/$arch/VERSION"); - } else { $date_repo = "UNKNOW date"; print "You should check that a VERSION file is present"; } + } else { $date_repo = "UNKNOW date"; print "You should check that a VERSION file is present" } open my $B, ">$index"; print $B " @@ -141,7 +140,7 @@ Pubkey: $media->{pubkey} my $short_name = basename($files->{file}); print $B "
  • $short_name
    • \n"; system("cp -af $files->{file} $webdir/input/"); - } else { print $B "
  • $files->{file} not present
    • "; } + } else { print $B "
  • $files->{file} not present
    • " } } print $B "\n"; @@ -153,7 +152,7 @@ Pubkey: $media->{pubkey} my $short_name = basename($files->{file}); print $B "
  • $short_name
    • \n"; system("cp -af $files->{file} $webdir/input/"); - } else { print $B "$files->{file} not present"; } + } else { print $B "$files->{file} not present" } } print $B "\n"; close $B; diff --git a/create_dual.sh b/create_dual.sh index cd7167e..69848c4 100755 --- a/create_dual.sh +++ b/create_dual.sh @@ -1,8 +1,8 @@ #!/bin/sh DISTRIB=mageia-dual -TAG=autumn -VERSION=2-alpha1 +TAG=manon +VERSION=2-beta1 VV=1 MEDIAMAIN=media/core PIECES="$HOME/build_bcd/pieces" @@ -10,7 +10,7 @@ BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION" BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION" # genisoimage options -AGENISO="$DISTRIB - 2 alpha1" +AGENISO="$DISTRIB - 2 beta1" PUBLISHER="Mageia.Org" SYSID="$PUBLISHER" TOOL="$SYSID BCD" @@ -18,94 +18,15 @@ VOLSET="$SYSID $DISTRIB - $VERSION" VOLUME="$DISTRIB-$VERSION" -./bcd.pl dual.xml all copy noiso nodoble -./bcd.pl dual64.xml all copy noiso nodoble - -rm -vf $BUILDPATH-i586/i586/install/images/boot.iso -rm -rvf $BUILDPATH-i586/i586/install/images/alternatives -rm -vf $BUILDPATH-x86_64/x86_64/install/images/boot.iso -rm -vrf $BUILDPATH-x86_64/x86_64/install/images/alternatives - -sync - -du -sh $BUILDPATH-i586/i586 -du -sh $BUILDPATH-x86_64/x86_64 - -rm -rf $BUILDPATH -rm -rvf $BUILDISOPATH -mkdir -p $BUILDPATH -mkdir -p $BUILDISOPATH - -cp -af $BUILDPATH-i586/i586 $BUILDPATH -cp -af $BUILDPATH-x86_64/x86_64 $BUILDPATH - -cp -af $PIECES/$VV/i586/dosutils $BUILDPATH -cp -af $PIECES/$VV/i586/autorun.inf $BUILDPATH - -cd $BUILDPATH/x86_64/$MEDIAMAIN - - -for i in *noarch.rpm -do - if [ -f "../../../i586/$MEDIAMAIN/$i" ];then - echo $i - echo "erase package $i" - rm -vf $i - echo "link with the i586 one" - ln -sf ../../../i586/$MEDIAMAIN/$i . - else - echo "no ../../../i586/$MEDIAMAIN/$i package" - fi -done - -cat >> $BUILDPATH/i586/isolinux/isolinux.cfg <> $BUILDPATH/$DISTRIB-$VERSION.idx -cat $BUILDPATH-x86_64/x86_64/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION.idx - genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 \ - -A "$AGENISO" + -A "$AGENISO" \ -publisher "$PUBLISHER" \ -sysid "$SYSID" \ -p "$TOOL" \ -volset "$VOLSET" \ -V "$VOLUME" \ - -o "$BUILDISOPATH/$DISTRIB.iso" \ - -b i586/isolinux/isolinux.bin \ + -o "$BUILDISOPATH/$DISTRIB-$VERSION.iso" \ + -b isolinux/isolinux.bin \ -boot-info-table \ -quiet \ $BUILDPATH/ diff --git a/doc/howto_bcd.pdf b/doc/howto_bcd.pdf index f21a855..1be38d6 100644 Binary files a/doc/howto_bcd.pdf and b/doc/howto_bcd.pdf differ diff --git a/dual.xml b/dual.xml index 5040fe0..ff55b68 100644 --- a/dual.xml +++ b/dual.xml @@ -6,6 +6,7 @@ cauldron + rpmcheck i586 /home/bcd/build_bcd/pieces @@ -73,9 +74,6 @@ lists/exclude_mini - - lists/exclude_mini32 - yes @@ -93,7 +91,7 @@ - 2-alpha1 + 2-beta1 /home/bcd/build_bcd/pieces/cauldron/i586/media/media_info media/media_info @@ -114,7 +112,7 @@ - autumn + manon 1 1 mageia-dual @@ -130,11 +128,11 @@ yes
    Mageia - Mageia - mageia dual 2 - alpha1 - Mageia - 2 - dual - alpha1 + Mageia - mageia dual 2 - beta1 + Mageia - 2 - dual - beta1 Mageia.Org Mageia BCD - mageia-dual - 2 - alpha1 + mageia-dual - 2 - beta1 Mageia.Org
    diff --git a/dual64.xml b/dual64.xml index e0eefc0..3ec386b 100644 --- a/dual64.xml +++ b/dual64.xml @@ -17,7 +17,7 @@ Core Updates Testing - /home/bcd/build_bcd/pieces/cauldron/i586/isolinux + /home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux /home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/hdt.c32 @@ -93,7 +93,7 @@ - 2-alpha1 + 2-beta1 /home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info media/media_info @@ -114,7 +114,7 @@ - autumn + manon 1 1 mageia-dual @@ -130,11 +130,11 @@ yes
    Mageia - Mageia - mageia dual 2 - alpha1 - Mageia - 2 - alpha1 + Mageia - mageia dual 2 - beta1 + Mageia - 2 - beta1 Mageia.Org Mageia BCD - mageia-dual - 2 - alpha1 + mageia-dual - 2 - beta1 Mageia.Org
    diff --git a/dvd_free32.xml b/dvd_free32.xml index 62c166f..7a1f015 100644 --- a/dvd_free32.xml +++ b/dvd_free32.xml @@ -104,7 +104,7 @@ - 2-alpha3 + 2-beta1 /home/bcd/build_bcd/pieces/cauldron/i586/media/media_info media/media_info @@ -140,11 +140,11 @@ yes
    Mageia - Mageia-2-i586-alpha3 - Mageia 2 - Alpha 3 - i586 DVD + Mageia-2-i586-beta1 + Mageia 2 - Beta 1 - i586 DVD Mageia Mageia BCD - Mageia 2 - Alpha 3 + Mageia 2 - Beta 1 Mageia
    diff --git a/dvd_free64.xml b/dvd_free64.xml index 2dcbcab..26144d7 100644 --- a/dvd_free64.xml +++ b/dvd_free64.xml @@ -67,6 +67,9 @@ lists/input_cat + + lists/kernel64 + @@ -104,7 +107,7 @@ - 2-alpha3 + 2-beta1 /home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info media/media_info @@ -140,11 +143,11 @@ yes
    Mageia - Mageia-2-x86_64-alpha3 - Mageia 2 - Alpha 3 - x86_64 DVD + Mageia-2-x86_64-beta1 + Mageia 2 - Beta 1 - x86_64 DVD Mageia Mageia BCD - Mageia 2 - Alpha 3 + Mageia 2 - Beta 1 Mageia
    diff --git a/lists/exclude b/lists/exclude index 8b9a616..b498ce0 100644 --- a/lists/exclude +++ b/lists/exclude @@ -124,12 +124,15 @@ cacao kaffe syslog-ng wine-doors -#texlive task-xfce-devel -ec-fonts-mftraced xfsm xdvi uClibc-zlib1-devel # bugged ! drakfon + +xguest +perl-LaTeX-Driver +texlive +lilypond diff --git a/lists/input_cat b/lists/input_cat index 6d6810e..92248c5 100644 --- a/lists/input_cat +++ b/lists/input_cat @@ -127,12 +127,10 @@ vpnclient vpnc openvpn openvpn-admin -texlive openssh-askpass-common sazanami-fonts-common gnu-free-fonts-common -c-ares vlc-plugin-common system-config-printer msec-gui @@ -140,7 +138,11 @@ msec-gui colorprompt chromium-browser vlc -anjuta supertux -eclipse kernel-firmware +icedtea-web + +gnumeric +abiword + +genhdlist2 diff --git a/lists/kernel32 b/lists/kernel32 index cdd8ff7..641c70e 100644 --- a/lists/kernel32 +++ b/lists/kernel32 @@ -1,6 +1,9 @@ kernel-desktop-latest -kernel-desktop586-latest kernel-desktop-devel-latest +kernel-desktop586-latest kernel-desktop586-devel-latest +kernel-server-latest +kernel-server-devel-latest kernel-headers kernel-source-latest +libcares2 diff --git a/lists/kernel64 b/lists/kernel64 index 8b23a7a..56d1467 100644 --- a/lists/kernel64 +++ b/lists/kernel64 @@ -2,3 +2,6 @@ kernel-desktop-latest kernel-desktop-devel-latest kernel-headers kernel-source-latest +kernel-server-latest +kernel-server-devel-latest +lib64cares2 -- cgit v1.2.1