Changeset 751 in ProjectBuilder for devel/pb/bin

Timestamp:

Mar 30, 2009, 3:48:21 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds snapshot support for VEs
• Force usage of correct arch in pb_distro_init to avoid issues when cross building

File:

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

devel/pb/bin/pb

@@ -620 +620 @@
                 chomp($arch);
                 my ($ddir, $dver, $dfam);
-                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}) = pb_distro_init($name,$ver);
+                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}) = pb_distro_init($name,$ver,$arch);
                 pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
@@ -1080 +1080 @@
             ($odir,$over,$oarch) = split(/-/,$v);
         }
-        ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over);
+        ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over,$oarch);
         pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
 
@@ -1401 +1401 @@
             }
         }
+        if ((($cmt eq "ve") || ($cmt eq "VEScript")) && ($snapme != 0)) {
+            pb_system("tar cfj $tp/$odir-$over-$oarch.tar.bz2 $tpdir","Creating a snapshot of $tpdir");
+        }
         pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     }
@@ -1410 +1413 @@
     my $pbforce=shift || 0; # Force stop of VM. Default not
     my $vm1=shift || undef; # Only that VM to treat
-    my $snapme=shift || 0;  # Do we have to crate a snapshot
+    my $snapme=shift || 0;  # Do we have to create a snapshot
     my $vm;
     my $all;
@@ -1585 +1588 @@
         my ($name,$ver,$darch) = split(/-/,$v);
         chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
+        my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
 
         if (($vetype eq "chroot") || ($vetype eq "schroot")) {
@@ -2011 +2014 @@
             my ($name,$ver,$darch) = split(/-/,$v);
             chomp($darch);
-            my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver);
+            my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
     
             my $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepkglist);