Changeset 2349 in /cluster/svnroot


Ignore:
Timestamp:
Apr 17, 2010 3:02:58 PM (11 years ago)
Author:
skylar
Message:

merging in grub splash screen (#436)

Location:
bccd-ng/trunk
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/trunk/bin/build_livecd.pl

    r2344 r2349  
    8484Readonly my $LIBFETCH   => "/root/liberate";
    8585$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";
     86Readonly 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";
    8787Readonly 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";
    8888Readonly my $BAD_PACKAGES   => ""; # Packages that throw some fatal error during install but still work
     
    9595Readonly my @TIME           => localtime();
    9696Readonly my $FORMAT_DATE    => ($TIME[5]+1900)."-".($TIME[4]+1)."-".$TIME[3];
     97Readonly my $SPLASH_FILE    => 'bccd_logo_new.png';
    9798# Revision fetch
    9899
     
    10921093    "revfetch",
    10931094    "",
     1095    "Fetched BCCD splash screen.",
     1096    $svnrev,
     1097    "$websvn/packages/$SPLASH_FILE",
     1098    "$BUILDDIR/$LIBFETCH/$SPLASH_FILE",
     1099    );
     1100
     1101$Bccd->run_test(
     1102    "revfetch",
     1103    "",
    10941104    "Fetched liberation exports file.",
    10951105    $svnrev,
     
    11961206    $svnrev,
    11971207    "$websvn/trees/KNOPPIX/",
     1208    );
     1209
     1210$Bccd->run_test(
     1211    "revfetch",
     1212    "",
     1213    "Fetched background image.",
     1214    $svnrev,
     1215    "$websvn/packages/$SPLASH_FILE",
     1216    "$tmpdir/$SPLASH_FILE",
     1217    );
     1218
     1219$Bccd->run_test(
     1220    "system",
     1221    "",
     1222    "Creating isolinux splash image.",
     1223    "pngtopnm $tmpdir/$SPLASH_FILE | ppmtolss16 > $tmpdir/KNOPPIX/boot/isolinux/logo.16",
    11981224    );
    11991225
  • bccd-ng/trunk/packages/boot/grub/menu.lst

    r2237 r2349  
    11default 0
    22timeout 10
     3splashimage (hd0,0)/grub/bccd_logo_new.xpm.gz
    34
    45title "2.6.31.12_aufs"
  • bccd-ng/trunk/packages/liberate.pl

    r2334 r2349  
    5050Readonly my $NEWHOME  => "$LIBDIR/bccd/home/";
    5151Readonly my $BOOTDEV  => $opts{'libdev'}."1";
     52Readonly my $SPLASH_FILE => "$LIBFETCH/bccd_logo_new.png";
    5253
    5354if($opts{'info'}) {
     
    294295    "/usr/sbin/chroot $LIBDIR /usr/sbin/grub-install $opts{'libdev'}",
    295296    );
     297
     298$Bccd->run_test(
     299        "system",
     300        "",
     301        "Made PNM splash screen.",
     302        "/usr/bin/convert $LIBFETCH/$SPLASH_FILE $LIBDIR/boot/grub/bccd_logo_new.xpm.gz",
     303        );
    296304
    297305$Bccd->run_test(
Note: See TracChangeset for help on using the changeset viewer.