Changeset 991 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Mar 1, 2010, 9:27:20 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3711@localhost: bruno | 2010-03-01 07:29:29 +0100

• veconf => rbsconf
• Adds option -a to rpmbootstrap in order for pb to automatically install the packages it needs
• Check CentOS4 VE OK
• Adds pb.conf man page to spec build

File:

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

devel/pb/bin/pb

@@ -1791 +1791 @@
                         my $rbsverb = "";
                         $rbsverb = "--verbose" if ($pbdebug gt 0);
-                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        my $addpkgs = "";
+                        my $postparam = "";
+                        $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
+                        if ($postparam eq "") {
+                            $addpkgs = "";
+                        } else {
+                            $addpkgs = "-a $postparam";
+                        }
+                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $addpkgs $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=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
@@ -2306 +2314 @@
     print SCRIPT << "EOF";
 pb_system("groupadd $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
-pb_system("useradd -g $pbac->{$ENV{'PBPROJ'}} -m -d $home/$pbac->{$ENV{'PBPROJ'}} $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$pbac->{$ENV{'PBPROJ'}}");
+pb_system("useradd -g $pbac->{$ENV{'PBPROJ'}} -m -d $home/$pbac->{$ENV{'PBPROJ'}} $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$pbac->{$ENV{'PBPROJ'}})");
 }
 EOF