Changeset 2519 in /cluster/svnroot


Ignore:
Timestamp:
Jul 13, 2010 11:08:11 AM (10 years ago)
Author:
fitz
Message:

merge from trunk

Location:
bccd-ng/branches/fitz-devel
Files:
8 edited
6 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/fitz-devel/bin/build_livecd.pl

    r2512 r2519  
    1515use Readonly;
    1616
     17$ENV{LANGUAGE} = "C";
     18$ENV{LC_ALL} = "C";
     19$ENV{LANG} = "C";
     20
    1721my %opts;
    1822
     
    5660}
    5761
    58 if( $opts{'nocleanup'} ) {
    59     $tmpdir = $ft->tempdir('$PROJECT',DIR => $dir,CLEANUP => 0);
    60 } else {
    61     $tmpdir = $ft->tempdir('$PROJECT',DIR => $dir,CLEANUP => 1);
    62 }
     62if(defined($opts{'nocleanup'})) {
     63        $ft = File::Temp->newdir("/tmp/$PROJECT.XXXXXXX",CLEANUP => 0);
     64}
     65else {
     66        $ft = File::Temp->newdir("/tmp/$PROJECT.XXXXXXX",DIR=>$dir,CLEANUP => 1);
     67}
     68$tmpdir = $ft->dirname();
     69
    6370$Bccd = new Bccd();
    6471
     
    8491Readonly my $LIBFETCH   => "/root/liberate";
    8592$ENV{'DEBIAN_FRONTEND'} = "noninteractive";
    86 Readonly my $PACKAGES   => "screen openssh-client openssh-server less make gcc-4.2 g++-4.2 flex bison gdb alien lsb-rpm cvs bzip2 sudo yum debootstrap rsync dhcp3-server tftpd-hpa tcpdump syslinux syslinux-common subversion nfs-common nfs-kernel-server ncurses-base ncurses-bin libncurses5 libncurses5-dev psmisc vim iproute pciutils host bc ntp ntpdate debconf-utils dhcpcd rsh-client rsh-server xbase-clients libxt-dev lesstif2 lesstif2-dev ipcalc dialog lvm2 grub parted tzdata xserver-xorg-video-fbdev xfonts-100dpi xfonts-75dpi xfonts-scalable xserver-xorg-video-all fontconfig xfonts-base gpm udev vtwm aterm rxvt xbase-clients menu bbkeys libwww-mechanize-perl postgresql-client-common postgresql-client-8.3 libdbi-perl libdbd-pg-perl strace tcsh libnet-dhcp-perl libnetaddr-ip-perl libnet-ip-perl libstdc++5 pdnsd csh libterm-readkey-perl libsvn-perl libui-dialog-perl libreadonly-perl sshfs autofs libnet-dhcp-perl dnsutils libfile-touch-perl libnet-cidr-perl arping dosfstools gawk dc glutg3-dev libxi-dev wireless-tools snmp snmpd netpbm imagemagick libyaml-perl";
     93Readonly my $PACKAGES   => "screen openssh-client openssh-server less make gcc-4.2 g++-4.2 flex bison gdb alien lsb-rpm bzip2 sudo yum debootstrap rsync dhcp3-server tcpdump syslinux syslinux-common subversion nfs-common nfs-kernel-server ncurses-base ncurses-bin libncurses5 libncurses5-dev psmisc vim iproute pciutils host bc ntp ntpdate debconf-utils dhcpcd xbase-clients libxt-dev lesstif2 lesstif2-dev ipcalc dialog lvm2 grub parted tzdata xserver-xorg-video-fbdev xfonts-100dpi xfonts-75dpi xfonts-scalable xserver-xorg-video-all fontconfig xfonts-base gpm udev vtwm aterm rxvt xbase-clients menu bbkeys libwww-mechanize-perl postgresql-client-common postgresql-client-8.3 libdbi-perl libdbd-pg-perl strace tcsh libnet-dhcp-perl libnetaddr-ip-perl libnet-ip-perl libstdc++5 pdnsd csh libterm-readkey-perl libsvn-perl libui-dialog-perl libreadonly-perl sshfs autofs libnet-dhcp-perl dnsutils libfile-touch-perl libnet-cidr-perl arping dosfstools gawk dc glutg3-dev libxi-dev wireless-tools snmp snmpd netpbm imagemagick libyaml-perl tcl8.4 libc6-i386";
    8794Readonly my $EXTRA_PACKAGES => "fftw2 fftw-dev sfftw-dev sfftw2 automake1.7 console-tools libreadline5-dev hal libxmu-headers libxmu-dev gfortran ethtool libssl0.9.8 libblas-dev libblas-dev atlas3-base atlas3-base-dev atlas3-base refblas3 lapack3 atlas3-test libg2c0-dev libg2c0 apache2 iceweasel xpdf octave3.0 ruby sl robotfindskitten pvm xpvm emacs grac blender automake1.9 libtool libglu1-mesa-dev minicom lcd4linux insight joe grace libxpm-dev telnet lsof xresprobe fbset fluxbox xgalaga zenmap nedit eterm manpages-dev";
     95Readonly my $AMD64_PACKAGES => "libc6-dev-i386 ia32-libs";
    8896Readonly my $BAD_PACKAGES   => ""; # Packages that throw some fatal error during install but still work
    8997Readonly my $PERLDIR        => "/usr/local/lib/site_perl/";
     
    150158    "",
    151159    "Mounted /proc into $BUILDDIR.",
    152     "mount -t proc proc $BUILDDIR/proc",
     160    "mount -t proc none $BUILDDIR/proc",
     161    );
     162
     163$Bccd->run_test(
     164    "system",
     165    "",
     166    "Mounted /sys into $BUILDDIR.",
     167    "mount -t sysfs none $BUILDDIR/sys",
    153168    );
    154169
     
    439454    );
    440455
    441 $Bccd->run_test(
    442     "system",
    443     "0",
    444     "Fetched Debian packages.",
    445     "/usr/sbin/chroot $BUILDDIR aptitude -y install $PACKAGES $EXTRA_PACKAGES",
     456if($opts{'arch'} eq 'i386') {
     457        $Bccd->run_test(
     458            "system",
     459            "0",
     460            "Fetched Debian packages.",
     461            "/usr/sbin/chroot $BUILDDIR /usr/bin/aptitude --allow-untrusted -y install $PACKAGES $EXTRA_PACKAGES",
     462            );
     463}
     464elsif($opts{'arch'} eq 'amd64') {
     465        $Bccd->run_test(
     466            "system",
     467            "0",
     468            "Fetched Debian packages.",
     469            "/usr/sbin/chroot $BUILDDIR aptitude --allow-untrusted -y install $PACKAGES $EXTRA_PACKAGES $AMD64_PACKAGES",
     470            );
     471}
     472
     473# Workaround for tftpd-hpa/inetd conflict
     474$Bccd->run_test(
     475    "system",
     476    "",
     477    "Removing inetutils-inetd to avoid conflict with tftpd-hpa.",
     478    "/usr/sbin/chroot $BUILDDIR /usr/bin/dpkg -r inetutils-inetd",
     479    );
     480
     481$Bccd->run_test(
     482    "system",
     483    100,
     484    "Fetching tftpd-hpa separately.",
     485    "/usr/sbin/chroot $BUILDDIR /usr/bin/apt-get --force-yes -y install tftpd-hpa",
    446486    );
    447487
     
    554594    );
    555595
    556 # PAM fetch
    557 foreach my $file ( "rlogin", "rsh" ) {
    558     $Bccd->run_test(
    559         "revfetch",
    560         "",
    561         "Fetched /etc/pam.d/$file file.",
    562         $svnrev,
    563         "$websvn/packages/etc/pam.d/$file",
    564         "$BUILDDIR/etc/pam.d/$file",
    565         );
    566 }
    567 
    568596# Install software
    569597
     
    642670    "Setting LSB parsing of init scripts.",
    643671    "touch $BUILDDIR/etc/update-rc.d-lsbparse",
     672    );
     673
     674$Bccd->run_test(
     675    "system",
     676    "",
     677    "Disabling hardware-optimized ld.so directories.",
     678    "touch $BUILDDIR/etc/ld.so.nohwcap",
    644679    );
    645680
     
    11551190
    11561191$Bccd->run_test(
     1192    "system",
     1193    "",
     1194    "Unmounted $BUILDDIR/sys.",
     1195    "umount -l $BUILDDIR/sys",
     1196    );
     1197
     1198$Bccd->run_test(
    11571199    "chdir",
    11581200    "",
     
    11981240        "Made ext2 filesystem in minirt filesystem.",
    11991241        "/sbin/mke2fs -F $tmpdir/minirt",
    1200         );
    1201 
    1202 $Bccd->run_test(
    1203         "system",
    1204         "",
    1205         "Set minirt fsck and reserved settings.",
    1206         "/sbin/tune2fs -c 0 -i 0 -m 0 $tmpdir/minirt",
    12071242        );
    12081243
     
    13281363}
    13291364
     1365chdir $ENV{'HOME'};
     1366
    13301367exit $Bccd->get_total()-$Bccd->get_passed();
    13311368
  • bccd-ng/branches/fitz-devel/packages/etc/auto.master

    r1800 r2519  
    1 /mnt/ssh /etc/auto.sshfs        uid=1000,gid=1000,--timeout=30,--ghost
     1/mnt/ssh /etc/auto.sshfs        uid=1000,gid=1000,--timeout=600,--ghost
  • bccd-ng/branches/fitz-devel/packages/etc/auto.sshfs

    r1837 r2519  
    1 software -fstype=fuse,rw,nodev,nonempty,noatime,allow_other,max_read=65536,cache_timeout=600 :sshfs\#bccd-ssh@bccd-ng.cluster.earlham.edu\:/chroot-sw/bccd/software/
     1software -fstype=fuse,rw,nodev,nonempty,noatime,allow_other,max_read=65536,cache_timeout=3600,cache_stat_timeout=3600,cache_dir_timeout=3600,cache_link_timeout=3600 :sshfs\#bccd-ssh@bccd-ng.cluster.earlham.edu\:/chroot-sw/bccd/software/
  • bccd-ng/branches/fitz-devel/packages/etc/skel/.bash_profile

    r2414 r2519  
    2727#module load modules/remote-bccd
    2828module load modules
    29 module load PSC_DX cuda dreamm fftw openmpi jre mcell mpe xmpi torque
     29module load PSC_DX cuda dreamm fftw openmpi jre mcell mpe xmpi c3 torque
    3030
    3131# Alias some MPI commands to get X-forwarding working properly.
  • bccd-ng/branches/fitz-devel/trees/home/bccd/Life/Life.c

    r2426 r2519  
    1919
    2020int main(int argc, char ** argv) {
     21       
     22#ifdef PETAKIT
     23        startTimer();
     24#endif
    2125        int count;
    2226        struct life_t life;
     
    3943        cleanup(&life);
    4044
     45#ifdef PETAKIT
     46        printStats("Life",life.size,"mpi",life.ncols * life.nrows, "1.3",0, 3, "iCOLUMNS", (long long int) life.ncols, "iROWS", (long long int)life.nrows, "iGENERATIONS", (long long int)life.generations);
     47#endif
     48
    4149        exit(EXIT_SUCCESS);
    4250}
  • bccd-ng/branches/fitz-devel/trees/home/bccd/Life/Life.h

    r2426 r2519  
    1616#include "XLife.h"    // For display routines
    1717#include "Defaults.h" // For Life's constants
     18#ifdef PETAKIT
     19#include "pkit.h"       // For PetaKit output
     20#endif
    1821
    1922#include <time.h>     // For seeding random
     
    2326#include <stdio.h>    // For file i/o
    2427
    25 int               init (struct life_t * life, int * c, char *** v);
    26 void        eval_rules (struct life_t * life);
     28int        init (struct life_t * life, int * c, char *** v);
     29void       eval_rules (struct life_t * life);
    2730void       copy_bounds (struct life_t * life);
    2831void       update_grid (struct life_t * life);
  • bccd-ng/branches/fitz-devel/trees/home/bccd/Life/Makefile

    r2420 r2519  
    3838
    3939PROGRAM   = Life
    40 SRCS      = Life.c
     40SRCS      = Life.c pkit.o
    4141OBJS      = $(SRCS:.c=.o)               # object file
    4242
  • bccd-ng/branches/fitz-devel/trees/usr/local/lib/site_perl/5.10.0/Bccd.pm

    r2399 r2519  
    471471sub test_mknods{
    472472        my($self,$type,$okrc,$msg,$file,$base) = @_;
    473         my($rc,$out);
     473        my($rc,$temprc,$out);
    474474        my $sub = 'test_mknods';
    475475
    476476        $self->enter_sub($sub);
     477
     478        if($okrc eq '') {
     479        $okrc = 0;
     480    }
    477481
    478482        my $y = $self->test_read_yaml($type,$okrc,"Reading mknod configuration from $file.",$file);
     
    481485        }
    482486
     487        $rc = 0;
    483488        foreach my $d (keys(%{$y})) {
    484489                my $cmd = "/bin/mknod $base/$d $y->{$d}->{type} $y->{$d}->{major} $y->{$d}->{minor}";
     
    487492        }
    488493
    489                 ($rc,$out) = $self->exec_system($cmd);
     494                ($temprc,$out) = $self->exec_system($cmd);
    490495                if($rc) {
    491                         $self->log_and_die("$cmd failed with $rc, out $out");
     496                        $self->log_and_cont("$cmd failed with $temprc, out $out");
     497                }
     498                if($temprc > $rc) {
     499                        $rc = $temprc;
    492500                }
    493501        }
    494502
     503    if($rc == $okrc) {
     504        $self->ok_msg($msg);
     505        $rc = 1;
     506    }
     507    else {
     508        $self->fail_msg($msg);
     509        $rc = 0;
     510    }
     511
    495512        $self->leave_sub($sub);
    496         return 0;
     513        return $rc;
    497514}
    498515
Note: See TracChangeset for help on using the changeset viewer.