Changeset 986 in ProjectBuilder for devel/pb

Timestamp:

Feb 21, 2010, 7:16:55 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3700@localhost: bruno | 2010-02-20 16:35:59 +0100

• Continue to improve pb.conf documentation
• veconf renamed as rbsconf
• ve4pi renamed rbs4pi
• new pb_get_postinstall generic function for rinse and rpmbootstrap
• ventp/vmntp is now optional
• licom_err needed by fedora 12
• make rpmbootstrap work for i386 distros

Location:

devel/pb

Files:

• bin/pb (modified) (8 diffs)
• lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -1174 +1174 @@
         # Specific VE
         $path = "vepath";
-        $conf = "veconf";
+        $conf = "rbsconf";
         $rebuild = "verebuild";
     } elsif ($cmt eq "Web") {
@@ -1252 +1252 @@
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     # Not mandatory...
-    my ($vrebuild,$veconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");
+    my ($vrebuild,$rbsconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -1261 +1261 @@
         ($vtmout) = pb_conf_get($tmout);
     }
-    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
+    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$rbsconf))."\n");
 
     my $mac;
@@ -1742 +1742 @@
 
         # Get VE context
-        my ($ptr,$vetmout,$vepath,$verebuild,$veconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
+        my ($ptr,$vetmout,$vepath,$verebuild,$rbsconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","rbsconf");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
         # We can probably only get those params now we have the distro context
-        my ($veb4pi,$vepi,$vesnap,$oscodename,$vepkglist,$osmindep) = pb_conf_get_if("veb4pi","vepi","vesnap","oscodename","vepkglist","osmindep");
+        my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$vepkglist,$osmindep) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","vepkglist","osmindep");
 
         if (($vetype eq "chroot") || ($vetype eq "schroot")) {
@@ -1760 +1760 @@
 
                     my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
+                    my $postinstall = pb_get_postinstall($ddir,$dver,$darch,$rbspi,$verpmstyle);
                     if ($verpmstyle eq "rinse") {
                         # Need to reshape the mirrors generated with local before-post-install script
                         my $b4post = "--before-post-install ";
-                        my $postparam = pb_distro_get_param($ddir,$dver,$darch,$veb4pi);
+                        my $postparam = pb_distro_get_param($ddir,$dver,$darch,$rbsb4pi);
                         if ($postparam eq "") {
                             $b4post = "";
                         } else {
                             $b4post .= $postparam;
-                        }
-                        # Do we have a local post-install script
-                        my $post = "--post-install ";
-                        $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepi);
-                        if ($postparam eq "") {
-                            $post = "";
-                        } else {
-                            $post .= $postparam;
                         }
 
@@ -1799 +1792 @@
                         $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'}}\" $b4post $post $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
+                        pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "rpmbootstrap") {
                         my $rbsverb = "";
                         $rbsverb = "--verbose" if ($pbdebug gt 0);
-                        pb_system("sudo /usr/bin/rpmbootstrap $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap 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)");
+                        pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$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/mock --install --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
                     } else {
                         die "Unknown verpmtype type $verpmstyle. Report to dev team";
@@ -1868 +1861 @@
 my $v = shift;
 
-my ($ntp) = pb_conf_get($vtype."ntp");
-my $vntp = $ntp->{$ENV{'PBPROJ'}};
+my ($ntp) = pb_conf_get_if($vtype."ntp");
+my $vntp = $ntp->{$ENV{'PBPROJ'}} if (defined $ntp);
 my $ntpline;
 
@@ -2939 +2932 @@
 }
 
+#
+# Return the postinstall line if needed
+#
+
+sub pb_get_postinstall {
+
+my $ddir = shift
+my $dver = shift
+my $darch = shift
+my $rbspi = shift
+my $vestyle = shift
+my $post = "";
+
+# Do we have a local post-install script
+if ($vestyle eq "rinse") {
+    $post = "--post-install ";
+} elsif ($vestyle eq "rpmbootstrap") {
+    $post = "-s ";
+}
+
+$postparam = pb_distro_get_param($ddir,$dver,$darch,$rbspi);
+if ($postparam eq "") {
+    $post = "";
+} else {
+    $post .= $postparam;
+}
+return($post);
+}
+
 1;

devel/pb/lib/ProjectBuilder/Env.pm

@@ -465 +465 @@
 #ventp default = pool.ntp.org
 #velogin $ENV{'PBPROJ'} = pb
-#vepath $ENV{'PBPROJ'} = /var/lib/mock
-#veconf $ENV{'PBPROJ'} = /etc/mock
+#vepath $ENV{'PBPROJ'} = /var/cache/rpmbootstrap
+#rbsconf $ENV{'PBPROJ'} = /etc/mock
 #verebuild $ENV{'PBPROJ'} = false