Changeset 4827 in /cluster/svnroot


Ignore:
Timestamp:
Jul 22, 2014 11:35:29 PM (6 years ago)
Author:
skylar
Message:

merging in #549, #671, #810, #852, #853, #863, #864

Location:
bccd-ng/tags/bccd-3.3.2-rc
Files:
9 deleted
17 edited
3 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/tags/bccd-3.3.2-rc

  • bccd-ng/tags/bccd-3.3.2-rc/bin/build_livecd.pl

    r4726 r4827  
    128128Readonly my $PROJDIR    => $BUILDDIR."/diskless/bccd/";
    129129Readonly my $BCCDCLIENT => $BUILDDIR."/diskless/clients/";
    130 Readonly my $NEWHOME    => "$BUILDDIR/bccd/home";
     130Readonly my $NEWHOME    => "$BUILDDIR/UNIONFS/home";
    131131Readonly my $CHECKIN    => "$NEWHOME/meta/nodes/";
    132132Readonly my $LIBFETCH   => "/root/liberate";
    133 Readonly my $KERNREV    => '3.6.0bccd-01310-gf2476c4';
     133Readonly my $KERNREV    => '3.14.0bccd-02979-gbb71e91-dirty';
    134134$ENV{DEBIAN_FRONTEND}    = "noninteractive";
    135135Readonly my $PERLDIR        => "/usr/local/lib/site_perl/";
     
    177177                                "usbhid.ko",
    178178                                "wd7000.ko",
     179                'xhci-hcd.ko',
    179180                                );
    180181
     
    224225);
    225226
     227# Make sure linux-image in packages.conf has the proper kernel revision
    226228for(my $i=0;$i<$#{$PACKAGES->{BASE}};$i++) {
    227229    if($PACKAGES->{BASE}->[$i] eq 'linux-image') {
     
    244246        '/usr/sbin/debootstrap',
    245247        '--exclude=linux-image-2.6.32-5,linux-image-2.6.32-5-amd64,linux-image-2.6.32-5-i686',
    246         "--include=linux-image-$KERNREV",
    247248        '--arch',
    248249        $opts{'ARCH'},
     
    342343    "$BUILDDIR/etc/dhcp", "$BUILDDIR/etc/ssh", "$BUILDDIR/$SOFTWARE",
    343344    "$BUILDDIR/root/.ssh", "$BUILDDIR/nfs", "$BUILDDIR/$LIBFETCH",
    344     "$BUILDDIR/var/run", "$BUILDDIR/var/log/apache2" ) {
     345    "$BUILDDIR/var/run", "$BUILDDIR/var/log/apache2",
     346    "$BUILDDIR/etc/apt/preferences.d/",
     347    "$BUILDDIR/var/lib/initramfs-tools", ) {
    345348    if( !(-d $dir) ) {
    346349        $Bccd->run_test(
     
    17181721    "$WORKSPACE/bin/rsync_svn.exclude",
    17191722);
    1720 
    1721 # Link mpd.conf
    1722 if($opts{'ARCH'} eq 'i386') {
    1723         $Bccd->run_test(
    1724                 "system",
    1725                 0,
    1726                 "Linking /etc/mpd.conf to i686 MPICH2 install",
    1727         [
    1728             '/usr/sbin/chroot',
    1729             $BUILDDIR,
    1730             '/bin/ln',
    1731             '-s',
    1732             '/etc/mpd.conf',
    1733             '/bccd/software/mpich2/1.4.1p1/Linux/BCCD/i686/etc/mpd.conf',
    1734         ],
    1735     );
    1736 }
    1737 elsif($opts{'ARCH'} eq 'amd64') {
    1738         $Bccd->run_test(
    1739                 "system",
    1740                 0,
    1741                 "Linking /etc/mpd.conf to x86_64 MPICH2 install",
    1742         [
    1743             '/usr/sbin/chroot',
    1744             $BUILDDIR,
    1745             'ln',
    1746             '-s',
    1747             '/etc/mpd.conf',
    1748             '/bccd/software/mpich2/1.4.1p1/Linux/BCCD/x86_64/etc/mpd.conf',
    1749         ],
    1750     );
    1751 }
    17521723
    17531724$Bccd->run_test(
  • bccd-ng/tags/bccd-3.3.2-rc/linux_config.amd64

    r4463 r4827  
    34233423#
    34243424# CONFIG_USB_C67X00_HCD is not set
    3425 # CONFIG_USB_XHCI_HCD is not set
     3425CONFIG_USB_XHCI_HCD=m
    34263426CONFIG_USB_EHCI_HCD=m
    34273427CONFIG_USB_EHCI_ROOT_HUB_TT=y
  • bccd-ng/tags/bccd-3.3.2-rc/linux_config.i386

    r4463 r4827  
    11#
    22# Automatically generated file; DO NOT EDIT.
    3 # Linux/i386 3.6.0bccd Kernel Configuration
     3# Linux/i386 3.6.0 Kernel Configuration
    44#
    55# CONFIG_64BIT is not set
     
    34233423#
    34243424# CONFIG_USB_C67X00_HCD is not set
    3425 # CONFIG_USB_XHCI_HCD is not set
     3425CONFIG_USB_XHCI_HCD=m
     3426# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
    34263427CONFIG_USB_EHCI_HCD=m
    34273428CONFIG_USB_EHCI_ROOT_HUB_TT=y
  • bccd-ng/tags/bccd-3.3.2-rc/packages/etc/apt/sources.list

    r3864 r4827  
    11# $Id$
    22
    3 deb [arch=i386,amd64] http://!DEBMIRROR! squeeze main non-free contrib
     3deb [arch=i386,amd64] http://debmirror.cluster.earlham.edu squeeze main non-free contrib
     4deb [arch=i386,amd64] http://debmirror.cluster.earlham.edu bccd-v332 main
    45deb-src http://ftp.us.debian.org/debian/ squeeze main non-free contrib
    56
  • bccd-ng/tags/bccd-3.3.2-rc/packages/etc/modules

    r4348 r4827  
    77w83627ehf
    88coretemp
     9
     10# ASROCK support (#853)
     11vga16fb
  • bccd-ng/tags/bccd-3.3.2-rc/packages/liberate.pl

    r4726 r4827  
    259259);
    260260
    261 $Bccd->run_test(
    262         "system",
    263         "",
    264         "Sleep for 15 seconds.",
    265         [
    266         '/bin/sleep',
    267         '15',
    268     ],
    269 );
     261if(! -b $opts{'libdev'}) {
     262    croak "$opts{'libdev'}2 does not exist!\n";
     263}
    270264
    271265$Bccd->run_test(
  • bccd-ng/tags/bccd-3.3.2-rc/packages/packages.conf

    r4726 r4827  
    110110   - x11vnc
    111111   - icedtea6-plugin
     112   - libblas-dev
     113# BCCD custom packages
     114   - atlas
     115   - cuda
     116   - fftw
     117   - hwloc
     118   - intelcc
     119   - lapack
     120   - mpi4py
     121   - mpich2
     122   - openmpi
     123   - papi
     124   - pypar
     125   - r
    112126EXTRA :
    113127    - fftw2
     
    179193    - wpasupplicant
    180194    - mesa-utils
     195    - linux-image
     196    - mailutils
    181197AMD64 :
    182198    - libc6-dev-i386
  • bccd-ng/tags/bccd-3.3.2-rc/packages/rsync_liberate.exclude

    r4726 r4827  
    66/tmp/*
    77/var/tmp/*
     8/home/* # ~bccd is /bccd/home, but a bind mount makes it show up here
  • bccd-ng/tags/bccd-3.3.2-rc/trees/KNOPPIX/boot/isolinux/minirt/linuxrc

    • Property svn:keywords set to Id
    r3864 r4827  
    11#!/static/sh
     2#
     3# $Id$
    24#
    35# KNOPPIX General Startup Script
     
    168170USB2="ehci-hcd"
    169171case "$CMDLINE" in *nousb2*) USB2=""; ;; esac
     172# Added ASROCK board support (#853)
     173USB3="xhci-hcd"
     174case "$CMDLINE" in *nousb3*) USB3=""; ;; esac
    170175
    171176KNOPPIX_DIR="KNOPPIX"
     
    420425 if /bbin/modprobe usbcore >/dev/null 2>&1; then
    421426  FOUNDUSB=""
    422   for i in $USB2 uhci-hcd ohci-hcd; do
     427  for i in ${USB2} ${USB3} uhci-hcd ohci-hcd; do
    423428   /bbin/modprobe $i >/dev/null 2>&1 && FOUNDUSB="yes"
    424429  done
  • bccd-ng/tags/bccd-3.3.2-rc/trees/arch/i386/bccd

  • bccd-ng/tags/bccd-3.3.2-rc/trees/bin/bccd-snarfhosts

    r4348 r4827  
    127127declare HEADNODE
    128128
     129DIR=/tmp/bccd/
     130
    129131if [[ ${STAGE} = "LIVE" ]]; then
    130         DIR=/tmp/bccd/
    131132        HEADNODE=$(hostname)
    132     # Append nodes
    133     for NODE in $(find ${DIR} -mindepth 1 -maxdepth 1 -exec basename {} \;); do
    134         add_uniq_node ${NODE}
    135     done
    136133elif [[ ${STAGE} = "LIBERATED" ]]; then
    137         DIR=/bccd/home/meta/nodes/
    138     for NODE in $(find ${DIR} -type f -cmin -2 -exec basename {} \;); do
    139         NODES[${#NODES[@]}]=${NODE}
    140     done
    141134    HEADNODE="node000"
    142135fi
     136# Append nodes
     137for NODE in $(find ${DIR} -mindepth 1 -maxdepth 1 -exec basename {} \;); do
     138    add_uniq_node ${NODE}
     139done
    143140
    144141# Make sure head node is included
  • bccd-ng/tags/bccd-3.3.2-rc/trees/bin/bccd-test-suite

    r4582 r4827  
    146146    # #806
    147147    if [ -d /bccd/software/cuda/5.5.22/Linux/BCCD/x86_64/nvvm/ ] || \
    148         [ -d /bccd/software/cuda/5.5.22/Linux/BCCD/i386/nvvm/ ]; then
     148        [ -d /bccd/software/cuda/5.5.22/Linux/BCCD/i686/nvvm/ ]; then
    149149        echo "#806 passed";
    150150    else
     
    275275    else
    276276        echo "CUDA FAILED"
     277        RC=$((RC+1))
     278    fi
     279
     280    # ASROCK USB support (#853)
     281    if [[ -f /lib/modules/$(uname -r)/kernel/drivers/usb/host/xhci-hcd.ko
     282]]; then
     283        echo "ASROCK USB support passed"
     284    else
     285        echo "ASROCK USB support FAILED"
    277286        RC=$((RC+1))
    278287    fi
  • bccd-ng/tags/bccd-3.3.2-rc/trees/diskless

  • bccd-ng/tags/bccd-3.3.2-rc/trees/etc/initramfs-tools.diskless/modules

    r3864 r4827  
    1515fat
    1616vfat
     17
     18# Needed for ASROCK boards (#853)
     19xhci-hcd
  • bccd-ng/tags/bccd-3.3.2-rc/trees/etc/skel/HPL-benchmark/Make.BCCD

    r4348 r4827  
    9494# used. The variable LAdir is only used for defining LAinc and LAlib.
    9595#
    96 LAdir        = /bccd/software/BLAS/
     96LAdir        = /usr/lib/libblas
    9797#LAinc        = $(LAdir)/include
    98 LAlib        = $(LAdir)/blas_LINUX.a
     98LAlib        = $(LAdir)/libblas.a
    9999#
    100100# ----------------------------------------------------------------------
  • bccd-ng/tags/bccd-3.3.2-rc/trees/usr/local/lib/site_perl/Bccd.pm

    r4726 r4827  
    4848my $passed = 0;
    4949my $total = 0;
    50 Readonly my $KERNREV => '3.6.0bccd-01310-gf2476c4';
     50Readonly my $KERNREV => '3.14.0bccd-02979-gbb71e91-dirty';
    5151Readonly my $DHCFILE => '/etc/dhcp/dhclient.conf';
    5252Readonly my $ALLOUTFILE    => "allout";
     
    604604    }
    605605
    606     print $OUTFILE "MD5 ($infile) = ".$md5->hexdigest()."\n";
     606    print $OUTFILE "MD5 (".basename($infile).") = ".$md5->hexdigest()."\n";
    607607
    608608    if(!defined(close($INFILE))) {
Note: See TracChangeset for help on using the changeset viewer.