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

Timestamp:

May 21, 2010, 3:29:59 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Adds rbsopt parameter + doc to allow for passing options to rpmbootstrap such as -k now by default.
• Mandriva VE are now working (tested with 2010.0 + package list fixed)

File:

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

devel/pb/bin/pb

@@ -1759 +1759 @@
                 if ($dtype eq "rpm") {
 
+                    # Which tool is used
                     my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
+
+                    # Get potential rbs option
+                    my ($rbsopt1) = pb_conf_get_if("rbsopt");
+                    my $rbsopt = "";
+                    if (defined $rbsopt1) {
+                        if (defined $rbsopt1->{$verpmstyle}) {
+                            $rbsopt = $rbsopt1->{$verpmstyle};
+                        } elsif (defined $rbsopt1->{$ENV{'PBPROJ'}}) {
+                            $rbsopt = $rbsopt1->{$ENV{'PBPROJ'}};
+                        } else {
+                            $rbsopt = "";
+                        }
+                    }
+
                     my $postinstall = pb_get_postinstall($ddir,$dver,$darch,$rbspi,$verpmstyle);
                     if ($verpmstyle eq "rinse") {
@@ -1791 +1806 @@
                         my ($rbsconf) = pb_conf_get("rbsconf");
 
-                        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");
+                        pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $rbsopt $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "rpmbootstrap") {
                         my $rbsverb = "";
@@ -1803 +1818 @@
                             $addpkgs = "-a $postparam";
                         }
-                        pb_system("sudo /usr/bin/rpmbootstrap $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        pb_system("sudo /usr/bin/rpmbootstrap $rbsopt $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "mock") {
                         my ($rbsconf) = pb_conf_get("rbsconf");
-                        pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$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 $rbsopt","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=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
@@ -1845 +1860 @@
                 }
             }
+            # Fix modes to allow access to the VE for pb user
+            pb_system("sudo chmod 755 $vepath->{$ENV{'PBPROJ'}}/$ddir $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch","Fixing permissions");
+
             # Test if an existing snapshot exists and use it if appropriate
             # And also use it of no local extracted VE is present