Changeset 749 in ProjectBuilder for devel/pb/bin

Timestamp:

Mar 30, 2009, 2:31:42 AM (16 years ago)

Author:

Bruno Cornec

Message:

• pb_get_arch placed lower in the modules tree and used everywhere uname was used
• Adds the possibility to replace the post-install script for rinse to allow for a perl script replacement which is common between distributions

File:

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

devel/pb/bin/pb

@@ -1579 +1579 @@
         # Get VE context
         my ($ptr,$vetmout,$vepath,$verebuild,$veconf,$vepostinstall) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
-        my ($veb4pi,$vepkglist) = pb_conf_get_if("veb4pi","vepkglist");
+        my ($veb4pi,$vepi,$vepkglist) = pb_conf_get_if("veb4pi","vepi","vepkglist");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
@@ -1600 +1600 @@
                     my $verpmstyle = pb_distro_get_param($ddir,$dver,$darch,$verpmtype);
                     if ($verpmstyle eq "rinse") {
-                        # Need to reshape the mirrors generated
-                        my $post = "--before-post-install ";
+                        # 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);
+                        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 = "";
@@ -1626 +1634 @@
                         $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");
+                        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");
                     } 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)");
@@ -2728 +2736 @@
 }
 
-# Which is our local arch ? (standardize on i386 for those platforms)
-sub pb_get_arch {
-
-my $arch = `uname -m`;
-chomp($arch);
-$arch =~ s/i.86/i386/;
-return($arch);
-}
-
 1;