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

Timestamp:

Apr 4, 2009, 7:42:24 PM (15 years ago)

Author:

Bruno Cornec

Message:

pb_distro_init now returns a 7th paramater which is the arch, useful for pbdistrocheck

File:

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

devel/pb/bin/pb

@@ -620 +620 @@
                 chomp($arch);
                 my ($ddir, $dver, $dfam);
-                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}) = pb_distro_init($name,$ver,$arch);
+                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
                 pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
@@ -827 +827 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
-    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n");
+    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
 
     # Get list of packages to build
@@ -834 +834 @@
     my $ptr = pb_get_pkg();
     @pkgs = @$ptr;
-
-    my $arch = pb_get_arch();
 
     my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
@@ -879 +877 @@
 
             # If needed we may add repository to the build env
-            my $darch = pb_get_arch();
-            pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
+            pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
@@ -908 +905 @@
             chmod 0755,"debian/rules";
 
-            my $darch = pb_get_arch();
-            pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
+            pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
             pb_distro_installdeps("debian/control",$dtype,$pbupd);
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
@@ -2292 +2288 @@
 # We need to have that pb_distro_init function
 # Get it from Project-Builder::Distribution
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init(); 
-print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
+my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init(); 
+print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $arch))."\n";
 
 # We may need a proxy configuration. Get it from the local env