Changeset 2606 in /cluster/svnroot


Ignore:
Timestamp:
Sep 1, 2010 12:04:22 AM (10 years ago)
Author:
skylar
Message:

rolling back some bad merges (#457)

File:
1 edited

Legend:

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

    r2605 r2606  
    33use strict;
    44use warnings;
    5 use lib "../trees/usr/local/lib/site_perl/5.10.0";
    65use Getopt::Long;
    76use Pod::Usage;
     
    4342
    4443if($opts{'help'}) {
    45     pod2usage(-verbose => 2);
     44    pod2usage(1);
    4645}
    4746
     
    5049   !$opts{'suite'}
    5150    ) {
    52     pod2usage(-verbose => 2);
     51    pod2usage(2);
    5352}
    5453
     
    9392Readonly my $KERNREV    => "2.6.31.12-aufs";
    9493$ENV{'DEBIAN_FRONTEND'} = "noninteractive";
    95 Readonly 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 initramfs-tools linux-image-$KERNREV xvfb libmime-lite-perl exim4";
     94Readonly 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 initramfs-tools linux-image-$KERNREV xvfb";
    9695Readonly 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";
    97 
    9896Readonly my $AMD64_PACKAGES => "libc6-dev-i386 ia32-libs";
    9997Readonly my $BAD_PACKAGES   => ""; # Packages that throw some fatal error during install but still work
     
    144142                                );
    145143
    146 Readonly my $SPLASH_FILE    => 'bccd_logo_new.png';
    147144# Revision fetch
    148145
     
    322319          "lam.conf", "init.d/bccd-nfs", "init.d/bccd-unite-sw", "init.d/bccd-nics",
    323320          "init.d/bccd-dhcp-conf", "init.d/bccd-route", "init.d/bccd-keyboard", "rc.local",
    324           "init.d/bccd-fsrw", "init.d/bccd-mail", "auto.master", "auto.sshfs", "ld.so.conf.d/CUDA.conf" ) {
     321          "init.d/bccd-fsrw", "auto.master", "auto.sshfs" ) {
    325322    $Bccd->run_test(
    326323        "revfetch",
     
    341338    );
    342339
    343 foreach my $file ( "bccd-networking", "bccd-passwd", "bccd-dhcp", "bccd-sshd", "bccd-nfs", "bccd-unite-sw", "bccd-nics", "bccd-dhcp-conf", "bccd-route", "bccd-keyboard", "bccd-fsrw", "bccd-mail", "bccd-test" ) {
     340foreach my $file ( "bccd-networking", "bccd-passwd", "bccd-dhcp", "bccd-sshd", "bccd-nfs", "bccd-unite-sw",
     341          "bccd-nics", "bccd-dhcp-conf", "bccd-route", "bccd-keyboard", "bccd-fsrw" ) {
    344342    $Bccd->run_test(
    345343        "chmod",
     
    729727}
    730728
    731 foreach my $script ( "bccd-passwd","bccd-sshd", "bccd-nfs", "bccd-mail", "nfs-common", "vboxadd-service", "mpd", "bccd-test", "bccd-mount-devs" ) {
     729foreach my $script ("nfs-common", "mpd", "bccd-mount-devs",) {
    732730    $Bccd->run_test(
    733731        "system",
     
    10641062                0755,
    10651063                "$BUILDDIR/home/$USER",
    1066                 );
    1067 
    1068 $Bccd->run_test(
    1069                 "chmod",
    1070                 "",
    1071                 "chmod 0770 $BUILDDIR/etc/pbs/checkpoint",
    1072                 0770,
    1073                 "$BUILDDIR/etc/pbs/checkpoint",
    1074                 );
    1075 
    1076 $Bccd->run_test(
    1077                 "chmod",
    1078                 "",
    1079                 "chmod 0750 $BUILDDIR/etc/pbs/mom_priv",
    1080                 0750,
    1081                 "$BUILDDIR/etc/pbs/mom_priv",
    1082                 );
    1083 
    1084 $Bccd->run_test(
    1085                 "chmod",
    1086                 "",
    1087                 "chmod 0750 $BUILDDIR/etc/pbs/server_priv",
    1088                 0750,
    1089                 "$BUILDDIR/etc/pbs/server_priv",
    1090                 );
    1091 
    1092 $Bccd->run_test(
    1093                 "chmod",
    1094                 "",
    1095                 "chmod 0750 $BUILDDIR/etc/pbs/sched_priv",
    1096                 0750,
    1097                 "$BUILDDIR/etc/pbs/sched_priv",
    1098                 );
    1099 
    1100 $Bccd->run_test(
    1101                 "chmod",
    1102                 "",
    1103                 "chmod 1777 $BUILDDIR/etc/pbs/spool",
    1104                 oct(1777),
    1105                 "$BUILDDIR/etc/pbs/spool",
    1106                 );
    1107 
    1108 $Bccd->run_test(
    1109                 "chmod",
    1110                 "",
    1111                 "chmod 1777 $BUILDDIR/etc/pbs/undelivered",
    1112                 oct(1777),
    1113                 "$BUILDDIR/etc/pbs/undelivered",
    11141064                );
    11151065
     
    13781328
    13791329$Bccd->run_test(
    1380         "mkpath",
    1381         "",
    1382         "Made minirt directory.",
    1383         "$tmpdir/KNOPPIX/boot/isolinux/minirt",
    1384         );
    1385 
    1386 $Bccd->run_test(
    13871330        "mknods",
    13881331        "",
     
    14571400        "$tmpdir/cloop.ko",
    14581401        "$tmpdir/KNOPPIX/KNOPPIX/modules/cloop.ko",
    1459         );
    1460 
    1461 $Bccd->run_test(
    1462         "system",
    1463         "",
    1464         "Unmounted loop filesystem.",
    1465         "umount $tmpdir/loop/",
    1466         );
    1467 
    1468 $Bccd->run_test(
    1469         "rmtree",
    1470         "",
    1471         "Removed minirt tree.",
    1472         "$tmpdir/KNOPPIX/boot/isolinux/minirt/",
    1473         );
    1474 
    1475 $Bccd->run_test(
    1476         "system",
    1477         "",
    1478         "Placed minirt in KNOPPIX tree.",
    1479         "gzip -c $tmpdir/minirt > $tmpdir/KNOPPIX/boot/isolinux/minirt.gz",
    1480         );
    1481 
    1482 $Bccd->run_test(
    1483     "revfetch",
    1484     "",
    1485     "Fetched background image.",
    1486     $svnrev,
    1487     "$websvn/packages/$SPLASH_FILE",
    1488     "$tmpdir/$SPLASH_FILE",
    1489     );
    1490 
    1491 $Bccd->run_test(
    1492     "system",
    1493     "",
    1494     "Creating isolinux splash image.",
    1495     "pngtopnm $tmpdir/$SPLASH_FILE | ppmtolss16 > $tmpdir/KNOPPIX/boot/isolinux/logo.16",
    1496     );
    1497 
    1498 $Bccd->run_test(
    1499         "revfetch",
    1500         "",
    1501         "Fetched minirt device configuration.",
    1502         $svnrev,
    1503         "$websvn/packages/mknod.y",
    1504         "$tmpdir/mknod.y",
    1505         );
    1506 
    1507 $Bccd->run_test(
    1508         "mknods",
    1509         "",
    1510         "Created minirt device nodes.",
    1511         "$tmpdir/mknod.y",
    1512         "$tmpdir/KNOPPIX/boot/isolinux/minirt",
    1513         );
    1514 
    1515 $Bccd->run_test(
    1516         "system",
    1517         "",
    1518         "Created minirt filesystem.",
    1519         "dd if=/dev/zero of=$tmpdir/minirt bs=1M count=4",
    1520         );
    1521 
    1522 $Bccd->run_test(
    1523         "system",
    1524         "",
    1525         "Made ext2 filesystem in minirt filesystem.",
    1526         "/sbin/mke2fs -F $tmpdir/minirt",
    1527         );
    1528 
    1529 $Bccd->run_test(
    1530         "system",
    1531         "",
    1532         "Set minirt fsck and reserved settings.",
    1533         "/sbin/tune2fs -c 0 -i 0 -m 0 $tmpdir/minirt",
    1534         );
    1535 
    1536 $Bccd->run_test(
    1537         "mkpath",
    1538         "",
    1539         "Made loop directory.",
    1540         "$tmpdir/loop",
    1541         );
    1542 
    1543 $Bccd->run_test(
    1544         "system",
    1545         "",
    1546         "Mounted minirt on loop directory.",
    1547         "/bin/mount -t ext2 -o loop $tmpdir/minirt $tmpdir/loop",
    1548         );
    1549 
    1550 $Bccd->run_test(
    1551         "system",
    1552         "",
    1553         "Copied minirt into loop filesystem.",
    1554         "rsync -a $tmpdir/KNOPPIX/boot/isolinux/minirt/ $tmpdir/loop/",
    15551402        );
    15561403
     
    16721519
    16731520This script is based on KNOPPIX project documentation for creating a
    1674                 #Test for running system commands
    16751521Debian-based Live CD using cloop.
    16761522
Note: See TracChangeset for help on using the changeset viewer.