Changeset 3186 in /cluster/svnroot


Ignore:
Timestamp:
May 15, 2011 4:52:32 PM (10 years ago)
Author:
skylar
Message:

merging in changes from skylar-devel (#632)

Location:
bccd-ng/branches/skylar-trac632/bin
Files:
1 deleted
1 edited
1 copied

Legend:

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

    r3166 r3186  
    3333use File::Temp;
    3434use File::Copy;
     35use File::Basename;
    3536use WWW::Mechanize;
    3637use POSIX;
     
    120121Readonly my $KERNREV    => "2.6.31.12-aufs";
    121122$ENV{'DEBIAN_FRONTEND'} = "noninteractive";
    122 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 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 genisoimage mingetty x11vnc sun-java6-plugin javacc openjdk-6-jdk condor";
    123 Readonly 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 ruby sl robotfindskitten pvm xpvm emacs21 grac automake1.9 libtool libglu1-mesa-dev minicom lcd4linux insight joe grace libxpm-dev telnet lsof xresprobe fbset fluxbox xgalaga zenmap nedit eterm manpages-dev";
    124 Readonly my $AMD64_PACKAGES => "libc6-dev-i386 ia32-libs lib32gfortran3 lib32readline5 nvidia-glx-ia32";
    125 Readonly my $BAD_PACKAGES   => ""; # Packages that throw some fatal error during install but still work
    126123Readonly my $PERLDIR        => "/usr/local/lib/site_perl/";
    127124Readonly my $TESTNAME       => "build_livecd";
     
    212209}
    213210
     211my $PACKAGES = $Bccd->run_test(
     212        "read_yaml",
     213        "",
     214        "Read package manifest.",
     215        dirname($0)."/packages",
     216        );
     217
     218for(my $i=0;$i<$#{$PACKAGES->{BASE}};$i++) {
     219        if($PACKAGES->{BASE}->[$i] eq 'linux-image') {
     220                $PACKAGES->{BASE}->[$i] .= "-$KERNREV";
     221        }
     222}
     223
    214224$Bccd->run_test(
    215225    "chdir",
     
    564574            "0",
    565575            "Fetched Debian packages.",
    566             "/usr/sbin/chroot $BUILDDIR /usr/bin/aptitude --allow-untrusted -y install $PACKAGES $EXTRA_PACKAGES",
     576            "/usr/sbin/chroot $BUILDDIR /usr/bin/aptitude --allow-untrusted -y install @{$PACKAGES->{BASE}} @{$PACKAGES->{EXTRA}}",
    567577            );
    568578}
     
    572582            "0",
    573583            "Fetched Debian packages.",
    574             "/usr/sbin/chroot $BUILDDIR aptitude --allow-untrusted -y install $PACKAGES $EXTRA_PACKAGES $AMD64_PACKAGES",
     584            "/usr/sbin/chroot $BUILDDIR aptitude --allow-untrusted -y install @{$PACKAGES->{BASE}} @{$PACKAGES->{EXTRA}} @{$PACKAGES->{AMD64}}",
    575585            );
    576586}
Note: See TracChangeset for help on using the changeset viewer.