Changeset 908


Ignore:
Timestamp:
Nov 24, 2009, 2:10:27 PM (10 years ago)
Author:
bruno
Message:
  • Force bash usage in pb to be OS compatible
  • Solaris setupvm improvements
  • Module-Build is now version 0.35 by default
Location:
devel
Files:
2 edited

Legend:

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

    r907 r908  
    258258osperldep pkg = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
    259259# Should be installaed manually first for the moment
    260 ospkgdep pkg = wget,make
     260#ospkgdep pkg = wget,make
     261# And also need ftp://ftp.sunfreeware.com/pub/freeware/sparc/10/sudo-1.7.2p1-sol10-sparc-local.gz ftp://ftp.sunfreeware.com/pub/freeware/sparc/10/make-3.81-sol10-sparc-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libintl-3.4.0-sol10-x86-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libiconv-1.9.2-sol10-x86-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libgcc-3.4.6-sol10-x86-local.gz
    261262
    262263# Version of the perl module as found on CPAN
    263264# http://search.cpan.org/CPAN/modules/by-module
    264265osperlver Date-Manip = 5.54
    265 osperlver Module-Build = 0.2808
     266osperlver Module-Build = 0.35
    266267osperlver File-MimeInfo = 0.15
    267268osperlver File-BaseDir = 0.03
  • devel/pb/bin/pb

    r907 r908  
    14471447    # Do not touch when just announcing
    14481448    if ($cmt ne "Announce") {
    1449         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");
     1449        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");
    14501450    } else {
    14511451        $logres = "> ";
     
    14581458    }
    14591459
    1460     pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | sh\"","Executing pbscript on $cptarget if needed","verbose");
     1460    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
    14611461    if ($cmt =~ /^V[EM]build/) {
    14621462        # Get back info on pkg produced, compute their name and get them from the VM
     
    15231523            }
    15241524        }
    1525         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)");
     1525        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)");
    15261526    }
    15271527    if (($cmt =~ /^VE/) && ($snapme != 0)) {
     
    23902390        my $dir = $m;
    23912391        $dir =~ s/-.*//;
    2392         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}");
     2392        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*\" | bash" ,"Installing perl module $m-$osperlver->{$m}");
    23932393    }
    23942394
Note: See TracChangeset for help on using the changeset viewer.