Changeset 127 in ProjectBuilder

Timestamp:

Sep 10, 2007, 10:48:42 AM (18 years ago)

Author:

Bruno Cornec

Message:

Work on build2vm

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -346 +346 @@
             pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
         } elsif ($dtype eq "slackware") {
+            $made="$made $ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
             pb_mkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
-            $made="$made $ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
         } else {
             die "Unknown dtype format $dtype";
@@ -466 +466 @@
     print SCRIPT "export PBROOT=\`pwd\`\n";
     print SCRIPT "# Build\n";
-    print SCRIPT "pb build2pkg $ARGV[0]\n";
+    my $p = "";
+    $p = $ARGV[0] if (defined $ARGV[0]);
+    print SCRIPT "pb build2pkg $p\n";
+    print SCRIPT "sudo halt -p\n";
     close(SCRIPT);
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";
@@ -475 +478 @@
     foreach my $v (@$vm) {
         # Launch the VMs
+        my ($ptr) = pb_conf_get("vmtype");
+        my $vmtype = $ptr->{$ENV{'PBPROJ'}};
+        my ($vmopt,$vmport,$vmpath) = pb_conf_read("$ENV{'PBETC'}","vmopt","vmport","vmpath");
+        $vmopt->{$vmtype} = $vmopt->{'default'} if ((not defined $vmopt->{$vmtype}) and (defined $vmopt->{'default'}));
+        $vmport->{$vmtype} = $vmport->{'default'} if ((not defined $vmport->{$vmtype}) and (defined $vmport->{'default'}));
+        $vmpath->{$vmtype} = $vmpath->{'default'} if ((not defined $vmpath->{$vmtype}) and (defined $vmpath->{'default'}));
+        if (defined $vmopt->{$vmtype}) {
+            $ENV{'PBVMOPT'} = $vmopt->{$vmtype};
+        } else {
+            $ENV{'PBVMOPT'} = "";
+        }
+
+        my $cmd;
+        if ($vmtype eq "qemu") {
+            my $arch = `uname -m`;
+            chomp($arch);
+            my $qemucmd;
+            my $qemucmd32;
+            my $qemucmd64;
+            if ($arch eq "x86_64") {
+                $qemucmd32 = "/usr/bin/qemu-system-i386";
+                $qemucmd64 = "/usr/bin/qemu";
+            } else {
+                $qemucmd32 = "/usr/bin/qemu";
+                $qemucmd64 = "/usr/bin/qemu-system-x86_64";
+            }
+            if ($v =~ /_64/) {
+                $qemucmd = "$qemucmd64 -no-kqemu";
+            } else {
+                $qemucmd = "$qemucmd32";
+            }
+            if (! -f "$vmpath->{$vmtype}/$v.qemu") {
+                print "Unable to find VM $vmpath->{$vmtype}/$v.qemu";
+                next;
+            }
+            $cmd = "$qemucmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$vmtype}:10.0.2.15:22 $vmpath->{$vmtype}/$v.qemu"
+        } elsif ($vmtype eq "xen") {
+        } elsif ($vmtype eq "vmware") {
+        } else {
+            die "VM of type $vmtype not supported. Report to the dev team";
+        }
+        pb_system("$cmd &","Launching the VM");
+        pb_system("sleep 300","Waiting for it to come up");
 
         # Gather all required files to send them to the VM and launch the build thourgh pbscript