Changeset 756 for devel/pb/bin/pb


Ignore:
Timestamp:
Apr 4, 2009, 7:42:24 PM (11 years ago)
Author:
Bruno Cornec
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r755 r756  
    620620                chomp($arch);
    621621                my ($ddir, $dver, $dfam);
    622                 ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}) = pb_distro_init($name,$ver,$arch);
     622                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
    623623                pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
    624624                pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
     
    827827
    828828    # Get the running distro to build on
    829     my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
    830     pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n");
     829    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
     830    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
    831831
    832832    # Get list of packages to build
     
    834834    my $ptr = pb_get_pkg();
    835835    @pkgs = @$ptr;
    836 
    837     my $arch = pb_get_arch();
    838836
    839837    my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
     
    879877
    880878            # If needed we may add repository to the build env
    881             my $darch = pb_get_arch();
    882             pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
     879            pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
    883880            foreach my $f (@specfile) {
    884881                if ($f =~ /\.spec$/) {
     
    908905            chmod 0755,"debian/rules";
    909906
    910             my $darch = pb_get_arch();
    911             pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
     907            pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
    912908            pb_distro_installdeps("debian/control",$dtype,$pbupd);
    913909            pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
     
    22922288# We need to have that pb_distro_init function
    22932289# Get it from Project-Builder::Distribution
    2294 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
    2295 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
     2290my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
     2291print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $arch))."\n";
    22962292
    22972293# We may need a proxy configuration. Get it from the local env
Note: See TracChangeset for help on using the changeset viewer.