Changeset 1015 in ProjectBuilder for devel/pb

Timestamp:

Apr 28, 2010, 5:29:27 PM (15 years ago)

Author:

Bruno Cornec

Message:

Fixes to support ia64 chroot with centos5

File:

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

devel/pb/bin/pb ¶

@@ -1742 +1742 @@
 
         # Get VE context
-        my ($ptr,$vepath,$rbsconf) = pb_conf_get("vetype","vepath","rbsconf");
+        my ($ptr,$vepath) = pb_conf_get("vetype","vepath");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
@@ -1789 +1789 @@
                         my $rinseverb = "";
                         $rinseverb = "--verbose" if ($pbdebug gt 0);
+                        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");
@@ -1804 +1805 @@
                         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") {
+                        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)");
                         # Once setup we need to install some packages, the pb account, ...