Changeset 670 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 9, 2009, 8:12:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

Adds rinse support for VE (begining)

File:

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

devel/pb/bin/pb

@@ -1354 +1354 @@
                 $vmexist = 0;
             }
+        } else {
+            #VE
+            $vmexist = 0;
+            $vmpid = 0;
         }
 
@@ -1469 +1473 @@
         # Get VE context
         my ($ptr,$vetmout,$vepath,$verebuild,$veconf,$vepostinstall) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
-        my ($veb4pi) = pb_conf_get_if("veb4pi");
+        my ($veb4pi,$vepkglist) = pb_conf_get_if("veb4pi","vepkglist");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
@@ -1483 +1487 @@
             }
 
+            my ($verpmtype) = pb_conf_get("verpmtype");
             if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} eq "true") || ($force == 1)) {
                 # We have to rebuild the chroot
                 if ($dtype eq "rpm") {
-                    # This was originaly planed to be used with mock => rinse
-                    #pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE");
-                    # 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");
-                    my $post = "--before-post-install ";
-                    if (defined $veb4pi->{"$ddir-$dver-$darch"}) {
-                        $post .= $veb4pi->{"$ddir-$dver-$darch"};
-                    } elsif (defined $veb4pi->{"$ddir-$dver"}) {
-                        $post .= $veb4pi->{"$ddir-$dver"};
-                    } elsif (defined $veb4pi->{"$ddir"}) {
-                        $post .= $veb4pi->{"$ddir"};
-                    } elsif (defined $veb4pi->{"default"}) {
-                        $post .= $veb4pi->{"default"};
-                    } else {
-                        $post = "";
+
+                    my $verpmstyle = pb_get_dist_param($ddir,$dver,$darch,$verpmtype);
+                    if ($verpmstyle eq "rinse") {
+                        # Need to reshape the mirrors generated
+                        my $post = "--before-post-install ";
+                        my $postparam = pb_get_dist_param($ddir,$dver,$darch,$veb4pi);
+                        if ($postparam eq "") {
+                            $post = "";
+                        } else {
+                            $post .= $postparam;
+                        }
+
+                        # Need to reshape the package list for pb
+                        my $addpkgs;
+                        $postparam = pb_get_dist_param($ddir,$dver,$darch,$vepkglist);
+                        if ($postparam eq "") {
+                            $addpkgs = "";
+                        } else {
+                            my $pkgfile = "$ENV{'PBTMP'}/addpkgs.lis";
+                            open(PKG,"> $pkgfile") || die "Unable to create $pkgfile";
+                            foreach my $p (split(/,/,$postparam)) {
+                                print PKG "$p\n";
+                            }
+                            close(PKG);
+                            $addpkgs = "--add-pkg-list $pkgfile";
+                        }
+                        my $rinseverb = "--verbose" if ($pbdebug gt 0);
+
+                        pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $post $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
+                    } elsif ($verpmstyle eq "mock") {
+                        pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
+                        # 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");
                     }
-                    pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $post","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
                 } elsif ($dtype eq "deb") {
                     pb_system("","Creating the pbuilder VE");
@@ -2463 +2485 @@
 }
 
+sub pb_get_dist_param {
+
+my $param = "";
+my $ddir = shift;
+my $dver = shift;
+my $darch = shift;
+my $opt = shift;
+
+if (defined $opt->{"$ddir-$dver-$darch"}) {
+    $param = $opt->{"$ddir-$dver-$darch"};
+} elsif (defined $opt->{"$ddir-$dver"}) {
+    $param = $opt->{"$ddir-$dver"};
+} elsif (defined $opt->{"$ddir"}) {
+    $param = $opt->{"$ddir"};
+} elsif (defined $opt->{"default"}) {
+    $param = $opt->{"default"};
+} else {
+    $param = "";
+}
+return($param);
+}
+
 1;