Changeset 1540 in ProjectBuilder
- Timestamp:
- May 13, 2012, 1:03:52 PM (12 years ago)
- Location:
- devel
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1539 r1540 112 112 'nover' => "false", 113 113 'rmdot' => "false", 114 'useminor' => "false", 114 115 }; 115 116 $pbos->{'name'} = shift; … … 644 645 sub pb_distro_get_param { 645 646 646 my @param ;647 my @param = (); 647 648 my $pbos = shift; 648 649 -
devel/pb-modules/lib/ProjectBuilder/Env.pm
r1528 r1540 1210 1210 umask 0022; 1211 1211 return(\%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir); 1212 } elsif ($action =~ /^newv/) { 1213 # No PBDESTDIR yet so doing nothing 1214 return; 1212 1215 } else { 1213 1216 # Setup the variables from what has been stored at the end of cms2build -
devel/pb-modules/lib/ProjectBuilder/VCS.pm
r1539 r1540 267 267 } elsif ($scheme =~ /^git/) { 268 268 open(GIT,"git --git-dir=$dir/.git remote -v |") || return(""); 269 while (<GIT RC>) {269 while (<GIT>) { 270 270 next unless (/^origin\s+(\S+) \(push\)$/); 271 271 return $1; 272 272 } 273 close(GIT RC);273 close(GIT); 274 274 warn "Unable to find origin remote for $dir"; 275 275 return ""; -
devel/pb/bin/pb
r1539 r1540 2314 2314 die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0)); 2315 2315 2316 # TODO: vmmonport should be optional 2317 my ($ptr,$ptr2,$vmpath,$vmport,$vms,$vmmonport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize","vmmonport"); 2318 my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm"); 2316 my ($ptr,$ptr2,$vmpath,$vmport,$vms) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize"); 2317 my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm,$vmmonport) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm","vmmonport"); 2319 2318 my $vmsize = pb_distro_get_param($pbos,$vms); 2320 2319 … … 2343 2342 2344 2343 # How much memory to allocate for VMs 2345 my $vmmem = pb_distro_get_param($pbos,$vmmm); 2346 if (defined $vmmem) { 2347 $ENV{'PBVMOPT'} .= " -m $vmmem"; 2344 if (defined $vmmm) { 2345 my $vmmem = pb_distro_get_param($pbos,$vmmm); 2346 if (defined $vmmem) { 2347 $ENV{'PBVMOPT'} .= " -m $vmmem"; 2348 } 2348 2349 } 2349 2350 … … 2361 2362 if (($vmtype eq "kvm") || ($vmtype eq "qemu")) { 2362 2363 # Configure the monitoring to automate the creation of the 'pb' snapshot 2363 $ENV{'PBVMOPT'} .= " -serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait" ;2364 $ENV{'PBVMOPT'} .= " -serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait" if ((defined $vmmonport) && (defined $vmmonport->{$ENV{'PBPROJ'}})); 2364 2365 # In that case no snapshot call needed 2365 2366 $ENV{'PBVMOPT'} =~ s/ -snapshot//; … … 2424 2425 } 2425 2426 pb_system("$cmd &","Launching the VM $vmm"); 2426 # Using system allows to kill it externaly if needed 2427 pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up" );2427 # Using system allows to kill it externaly if needed,sosupport that in the call 2428 pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up",undef,1); 2428 2429 $vmpid = pb_check_ps($tmpcmd,$vmm); 2429 2430 pb_log(0,"VM $vmm launched (pid $vmpid)\n");
Note:
See TracChangeset
for help on using the changeset viewer.