Changeset 892


Ignore:
Timestamp:
Oct 29, 2009, 2:35:35 AM (10 years ago)
Author:
bruno
Message:
  • remove call to bash to use generic sh. This has o be checked for compatibility issues
  • In conf file, when having a dependency on Module-Build, it has to be first, as some other may depend on it
Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r891 r892  
    221221# ospkgdep gives distribution package dependencies
    222222#
    223 # Asianux
     223# Asianux - Module-Build first for processing as neede by others
    224224osperldep asianux = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    225225ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp
    226 # Fedora
     226# Fedora - Module-Build first for processing as neede by others
    227227osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    228228ospkgdep fedora-4 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp
    229229osperldep fedora =
    230230ospkgdep fedora = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail
    231 # Slack
    232 osperldep tgz = Date-Manip,Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     231# Slack - Module-Build first for processing as neede by others
     232osperldep tgz = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    233233ospkgdep tgz = wget,make,ntp,patch
    234 # Old RedHat
    235 osperldep redhat = Date-Manip,Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     234# Old RedHat - Module-Build first for processing as neede by others
     235osperldep redhat = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    236236ospkgdep redhat = wget,make,ntp,patch
    237 # Old SuSE
    238 osperldep opensuse-10.0 = Date-Manip,Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     237# Old SuSE - Module-Build first for processing as neede by others
     238osperldep opensuse-10.0 = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    239239ospkgdep opensuse-10.0 = wget,make,ntp,patch
    240 osperldep opensuse-10.1 = Date-Manip,Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     240osperldep opensuse-10.1 = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    241241ospkgdep opensuse-10.1 = wget,make,ntp,patch
    242 osperldep suse = Date-Manip,Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     242osperldep suse = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    243243ospkgdep suse = wget,make,ntp,patch
    244 # New OpenSuSE
     244# New OpenSuSE - Module-Build first for processing as neede by others
    245245ospkgdep opensuse-10.2 = wget,make,ntp,patch
    246246ospkgdep opensuse-10.3 = wget,make,ntp,patch
     
    260260osperldep gen =
    261261ospkgdep gen = wget,ntp,make,patch,DateManip,File-MimeInfo,Mail-Sendmail
    262 # Solaris
    263 osperldep pkg = Date-Manip,Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     262# Solaris - Module-Build first for processing as neede by others
     263osperldep pkg = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
     264# Should be installaed manually first for the moment
    264265ospkgdep pkg = wget,make
    265266
  • devel/pb/bin/pb

    r891 r892  
    14441444    # Do not touch when just announcing
    14451445    if ($cmt ne "Announce") {
    1446         pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $cptarget");
     1446        pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | sh\"","Preparing $tdir on $cptarget");
    14471447    } else {
    14481448        $logres = "> ";
     
    14551455    }
    14561456
    1457     pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
     1457    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | sh\"","Executing pbscript on $cptarget if needed","verbose");
    14581458    if ($cmt =~ /^V[EM]build/) {
    14591459        # Get back info on pkg produced, compute their name and get them from the VM
     
    15201520            }
    15211521        }
    1522         pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     1522        pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | sh ; sleep 10","VM $v halt (pid $vmpid)");
    15231523    }
    15241524    if (($cmt =~ /^VE/) && ($snapme != 0)) {
     
    23862386        my $dir = $m;
    23872387        $dir =~ s/-.*//;
    2388         pb_system("rm -rf $m"."* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m"."* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf $m"."*","Installing perl module $m-$osperlver->{$m}");
     2388        pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | sh" ,"Installing perl module $m-$osperlver->{$m}");
    23892389    }
    23902390
Note: See TracChangeset for help on using the changeset viewer.