Changeset 1154


Ignore:
Timestamp:
Jan 12, 2011, 3:11:38 AM (9 years ago)
Author:
bruno
Message:
  • Let time to VM to be killed before launching a new one
  • Target build dir needs to be in dir/ver/arch to allow real build
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1153 r1154  
    17631763
    17641764        $src =~ s/^ *//;
    1765         pb_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over");
     1765        pb_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
    17661766        # Change pgben to make the next send2target happy
    17671767        my $made = "";
     
    17771777        foreach my $p (split(/ +/,$src)) {
    17781778            my $j = basename($p);
    1779             pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over");
     1779            pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over/$oarch 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
    17801780            $made="$made $odir/$over/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
    17811781        }
     
    17971797        pb_log(2,"Before sending pkgs, vmexist: $vmexist, vmpid: $vmpid\n");
    17981798        pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
    1799         pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
     1799        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
    18001800    }
    18011801    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ($cmt =~ /^V[ME]/);
     
    20262026                    pb_log(0,"WARNING: Killing the process ($vmssh) using port $nport (previous failed VM ?)\n");
    20272027                    kill 15,$vmssh;
     2028                    # Let it time to exit
     2029                    sleep 5;
    20282030                }
    20292031                pb_system("$cmd &","Launching the VM $vmm");
Note: See TracChangeset for help on using the changeset viewer.