Changeset 964 in ProjectBuilder

Timestamp:

Feb 8, 2010, 3:47:40 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3659@localhost: bruno | 2010-02-07 02:02:22 +0100

• Now we have debootstrap working (on Mandriva) for VE.

Files:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• devel/pb/bin/pb (modified) (4 diffs)
• projects/rinse/pbconf/devel/conf/.pbrc (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -138 +138 @@
 #   $opt="--exclude=*.i?86";
 #   }
+pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n");
 
 return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch);
@@ -441 +442 @@
     $param = "";
 }
+pb_log(2,"DEBUG: pb_distro_get_param on ",Dumper($opt)," returns $param\n");
 return($param);
 

devel/pb/bin/pb

@@ -1744 +1744 @@
                 if ($dtype eq "rpm") {
 
-                    my $verpmstyle = pb_distro_get_param($ddir,$dver,$darch,$verpmtype);
+                    my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
                     if ($verpmstyle eq "rinse") {
                         # Need to reshape the mirrors generated with local before-post-install script
@@ -1789 +1789 @@
                         # Once setup we need to install some packages, the pb account, ...
                         pb_system("sudo /usr/sbin/mock --install --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
+                    } else {
+                        die "Unknown verpmtype type $verpmstyle. Report to dev team";
                     }
                 } elsif ($dtype eq "deb") {
-                    my $vedebstyle = pb_distro_get_param($ddir,$dver,$darch,$vedebtype);
+                    my $vedebstyle = $vedebtype->{$ENV{'PBPROJ'}};
                     my $codename = pb_distro_get_param($ddir,$dver,$darch,$oscodename);
                     my $postparam = "";
@@ -1807 +1809 @@
                     $darch = "amd64" if ($darch eq "x86_64");
                     if ($vedebstyle eq "debootstrap") {
-                        pb_system("sudo /usr/sbin/debootstrap --arch=$darch $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" $addpkgs","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        my $dbsverb = "";
+                        $dbsverb = "--verbose" if ($pbdebug gt 0);
+
+                        pb_system("sudo /usr/sbin/debootstrap $dbsverb --arch=$darch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\"","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
+                    } else {
+                        die "Unknown vedebtype type $vedebstyle. Report to dev team";
                     }
                 } elsif ($dtype eq "ebuild") {
@@ -2202 +2209 @@
     } elsif ($vtype eq "ve") {
         # We need to finish the setup of packages needed in the VE if needed
-        # rinse/deboostrap at least needs it
+        # rinse/debootstrap at least needs it
         my ($vepkglist,$osmindep) = pb_conf_get_if("vepkglist","osmindep");
 

projects/rinse/pbconf/devel/conf/.pbrc

@@ -6 +6 @@
 verpmtype default = rinse
 # Possible value is debootstrap
-vedebtype default = deboostrap
+vedebtype default = debootstrap
 # Path to store the VE
 vepath default = /home/rinse