diff -Naur lbe.orig/kernel-src/initrd-2.6.9/buildk lbe/kernel-src/initrd-2.6.9/buildk --- lbe.orig/kernel-src/initrd-2.6.9/buildk 2005-01-13 20:01:30.000000000 +0100 +++ lbe/kernel-src/initrd-2.6.9/buildk 2005-02-05 20:04:47.854866761 +0100 @@ -112,6 +112,7 @@ MKNBI=mknbi-linux KERNEL_OUTPUT=vmlinuz-${KERNEL_VER} +KERNEL_OUTPUT_SPLASH=vmlinuz-splash-${KERNEL_VER} INITRD_IMG=${DEST}/initrd.ltsp echo "VER = ${VER}" @@ -301,9 +302,28 @@ ${INITRD_OUTPUT} # +# Create kernel+initrd image with bootsplash support +# +INITRD_OUTPUT_SPLASH=${DEST}/initrd-splash-${KERNEL_VER}.gz +cp ${INITRD_OUTPUT} ${INITRD_OUTPUT_SPLASH} + +# Create splash signature and append it to the gzipped initrd +/sbin/splash.bin -s -f \ + /etc/bootsplash/themes/Linux/config/bootsplash-1024x768.cfg \ + >> ${INITRD_OUTPUT_SPLASH} + +echo "running mknbi-linux (splash)" +${MKNBI} --output=${DEST}/${KERNEL_OUTPUT_SPLASH} \ + --append="init=/linuxrc rw video=vesafb:mttr vga=791 splash=silent" \ + --rootdir="/dev/ram0" \ + ${KERNEL_IMG} \ + ${INITRD_OUTPUT_SPLASH} + +# # Show the size of the kernel+initrd image # ls -l ${DEST}/${KERNEL_OUTPUT} +ls -l ${DEST}/${KERNEL_OUTPUT_SPLASH} echo diff -Naur lbe.orig/kernel-src/initrd_tree/initrd_tree/linuxrc lbe/kernel-src/initrd_tree/initrd_tree/linuxrc --- lbe.orig/kernel-src/initrd_tree/initrd_tree/linuxrc 2004-07-05 02:55:31.000000000 +0200 +++ lbe/kernel-src/initrd_tree/initrd_tree/linuxrc 2005-02-05 19:59:50.102677000 +0100 @@ -49,6 +49,7 @@ [ "${INITRD_DBG}" = "1" ] && exec /bin/sh +[ -w /proc/splash ] && echo "show 10000" > /proc/splash [ -w /proc/progress ] && echo 40 "Detecting network card" >/proc/progress [ "${SLEEP}" -gt 0 ] && sleep ${SLEEP} @@ -99,6 +100,7 @@ IRQOPT="irq=${IRQ}" fi +[ -w /proc/splash ] && echo "show 20000" > /proc/splash [ -w /proc/progress ] && echo 45 "Loading network driver" >/proc/progress [ "${SLEEP}" -gt 0 ] && sleep ${SLEEP} @@ -124,6 +126,7 @@ # /etc/dhcpc/dhcpcd.exe is used to perform additional configuration. # [ "${INITRD_DBG}" = "6" ] && exec /bin/sh +[ -w /proc/splash ] && echo "show 30000" > /proc/splash [ -w /proc/progress ] && echo 50 "Sending DHCP request" >/proc/progress [ "${SLEEP}" -gt 0 ] && sleep ${SLEEP} @@ -197,6 +200,7 @@ NFS_IP=${DHCPSERVER} fi +[ -w /proc/splash ] && echo "show 40000" > /proc/splash [ -w /proc/progress ] && echo 55 "Mounting root filesystem" >/proc/progress [ "${SLEEP}" -gt 0 ] && sleep ${SLEEP} @@ -218,6 +222,7 @@ fi [ "${INITRD_DBG}" = "8" ] && exec /bin/sh +[ -w /proc/splash ] && echo "show 50000" > /proc/splash [ -w /proc/progress ] && echo 60 "Pivoting root" >/proc/progress [ "${SLEEP}" -gt 0 ] && sleep ${SLEEP} @@ -235,6 +240,7 @@ # We temporarily re-mount /proc, so we can display the progress message # mount -t proc /proc /proc +/usr/bin/[ -w /proc/splash ] && echo "show 65534" > /proc/splash /usr/bin/[ -w /proc/progress ] && echo 65 "Running /sbin/init" >/oldroot/proc/progress /usr/bin/[ "${SLEEP}" -gt 0 ] && sleep ${SLEEP} diff -Naur lbe.orig/kernel-src/linux-2.6.9/config lbe/kernel-src/linux-2.6.9/config --- lbe.orig/kernel-src/linux-2.6.9/config 2005-01-13 20:02:05.000000000 +0100 +++ lbe/kernel-src/linux-2.6.9/config 2005-02-05 19:59:50.106677000 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.9-ltsp-1 -# Mon Dec 20 00:15:26 2004 +# Sat Feb 5 17:29:26 2005 # CONFIG_X86=y CONFIG_MMU=y @@ -285,7 +285,7 @@ # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set @@ -1258,10 +1258,12 @@ # # Logo configuration # -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set + +# +# Bootsplash configuration +# +CONFIG_BOOTSPLASH=y # # Sound diff -Naur lbe.orig/kernel-src/linux-2.6.9/package.def lbe/kernel-src/linux-2.6.9/package.def --- lbe.orig/kernel-src/linux-2.6.9/package.def 2005-01-13 20:02:05.000000000 +0100 +++ lbe/kernel-src/linux-2.6.9/package.def 2005-02-05 19:59:50.107676000 +0100 @@ -17,12 +17,17 @@ PKG1 = linux-${KERNEL_VER}.tar.bz2 MD5SUM1 = e921200f074ca97184e150ef5a4af825 +PKG2 = bootsplash-3.1.4-sp3-2.6.9-rc4.diff +MD5SUM2 = 13f863c25d272e1ef08af621ce0f24fa SOURCE1 = ftp://ftp.kernel.org/pub/linux/kernel/v2.6/${PKG1}, \ http://source.ltsp.org/tarballs/${PKG1}, \ ftp://ftp.sourceforge.net/pub/sourceforge/ltsp/${PKG1} +SOURCE2 = http://www.bootsplash.de/files/${PKG2} + UNPACK1 = bunzip2 < ${TARBALL} | tar xf - +UNPACK2 = cp ${TARBALL} . SOURCEDIR = linux-${KERNEL_VER} @@ -31,6 +36,8 @@ CONFIGURE = cp ../config .config && \ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${EXTRAVERSION}/" Makefile +POSTPATCH1 = patch -p1 < ../bootsplash-3.1.4-sp3-2.6.9-rc4.diff + BUILD = CPUS=${CPUS} ../build_kernel ${KERNEL_VER} ${EXTRAVERSION} CLEAN = rm -rf ${BUILDDIR} ${SOURCEDIR} diff -Naur lbe.orig/kernel-src/syslinux/install.sh lbe/kernel-src/syslinux/install.sh --- lbe.orig/kernel-src/syslinux/install.sh 2005-01-23 21:32:46.000000000 +0100 +++ lbe/kernel-src/syslinux/install.sh 2005-02-05 19:59:50.108676000 +0100 @@ -40,20 +40,29 @@ # cat <${PXEDIR}/pxelinux.cfg/default prompt 0 +default linux + label linux kernel bzImage-${KERNEL_VER} append init=/linuxrc rw root=/dev/ram0 initrd=initrd-${KERNEL_VER}.gz + +label linux-splash + kernel bzImage-${KERNEL_VER} + append init=/linuxrc rw root=/dev/ram0 initrd=initrd-splash-${KERNEL_VER}.gz video=vesafb:mttr vga=791 splash=silent EOF cp ${DEST}/bzImage-${KERNEL_VER} ${DEST}/${KERNEL_VER}/ cp ${DEST}/initrd-${KERNEL_VER}.gz ${DEST}/${KERNEL_VER}/ +cp ${DEST}/initrd-splash-${KERNEL_VER}.gz ${DEST}/${KERNEL_VER}/ FILELIST=/tmp/ltsp_kernel.list cat <${FILELIST} vmlinuz-${KERNEL_VER} +vmlinuz-splash-${KERNEL_VER} ${KERNEL_VER}/ ${KERNEL_VER}/bzImage-${KERNEL_VER} ${KERNEL_VER}/initrd-${KERNEL_VER}.gz +${KERNEL_VER}/initrd-splash-${KERNEL_VER}.gz ${KERNEL_VER}/pxelinux.0 ${KERNEL_VER}/pxelinux.cfg ${KERNEL_VER}/pxelinux.cfg/default diff -Naur lbe.orig/lbe-src/bootsplash/package.def lbe/lbe-src/bootsplash/package.def --- lbe.orig/lbe-src/bootsplash/package.def 1970-01-01 01:00:00.000000000 +0100 +++ lbe/lbe-src/bootsplash/package.def 2005-02-05 19:59:50.111676000 +0100 @@ -0,0 +1,37 @@ +# +# package.def file for building a package in the the LTSP build environment +# +# Copyright (c) 2003 by James A. McQuillan (McQuillan Systems, LLC) +# Copyright (c) 2004 by Rasmus Ory Nielsen +# +# This software is licensed under the Gnu General Public License. +# The full text of which can be found at http://www.LTSP.org/license.txt +# + +VERSION = 3.1 +RELEASE = 0 +PKG1COMPONENT = lbe_core +PKG1NAME = lbe-bootsplash + +PKG1 = bootsplash-3.1.tar.bz2 +MD5SUM1 = f9950a4d61fe6261e3211d317eab0e03 + +SOURCE1 = http://www.bootsplash.de/files/splashutils/${PKG1} + +UNPACK1 = tar xjf ${TARBALL} + +BUILDDIR = bootsplash-3.1 + +BUILD = cd Utilities && \ + make -j ${CPUS} PREFIX=${INSTALLDIR} CFLAGS="-march=i386" \ + splash && \ + strip splash + +INSTALL = cd Utilities && \ + install -m 755 splash ${INSTALLDIR}/sbin/splash.bin && \ + cd ../Scripts && \ + install -m 755 splash.sh ${INSTALLDIR}/sbin/splash + +CLEAN = rm -rf ${BUILDDIR} && \ + rm -f ${INSTALLDIR}/sbin/splash.bin && \ + rm -f ${INSTALLDIR}/sbin/splash diff -Naur lbe.orig/lbe-src/bootsplash-theme/package.def lbe/lbe-src/bootsplash-theme/package.def --- lbe.orig/lbe-src/bootsplash-theme/package.def 1970-01-01 01:00:00.000000000 +0100 +++ lbe/lbe-src/bootsplash-theme/package.def 2005-02-05 19:59:50.112675000 +0100 @@ -0,0 +1,35 @@ +# +# package.def file for building a package in the the LTSP build environment +# +# Copyright (c) 2003 by James A. McQuillan (McQuillan Systems, LLC) +# Copyright (c) 2004 by Rasmus Ory Nielsen +# +# This software is licensed under the Gnu General Public License. +# The full text of which can be found at http://www.LTSP.org/license.txt +# + +VERSION = 1.0 +RELEASE = 0 +PKG1COMPONENT = lbe_core +PKG1NAME = lbe-bootsplash-theme + +PKG1 = Theme-Linux.tar.bz2 +MD5SUM1 = 3f4c45b28f915b69a3bf2828936ef117 + +SOURCE1 = ftp://ftp.openbios.org/pub/bootsplash/themes/${PKG1} + +UNPACK1 = tar xjf ${TARBALL} + +BUILDDIR = Linux + +INSTALL = mkdir -p ${INSTALLDIR}/etc/bootsplash/themes/Linux/config && \ + mkdir -p ${INSTALLDIR}/etc/bootsplash/themes/Linux/images && \ + install -m 644 config/bootsplash-1024x768.cfg \ + ${INSTALLDIR}/etc/bootsplash/themes/Linux/config && \ + install -m 644 images/bootsplash-1024x768.jpg \ + ${INSTALLDIR}/etc/bootsplash/themes/Linux/images && \ + install -m 644 images/silent-1024x768.jpg \ + ${INSTALLDIR}/etc/bootsplash/themes/Linux/images + +CLEAN = rm -rf ${BUILDDIR} && \ + rm -rf ${INSTALLDIR}/etc/bootsplash diff -Naur lbe.orig/lbe-src/package_list lbe/lbe-src/package_list --- lbe.orig/lbe-src/package_list 2005-01-23 21:32:46.000000000 +0100 +++ lbe/lbe-src/package_list 2005-02-05 19:59:50.115675000 +0100 @@ -38,3 +38,5 @@ util-linux cpio module-init-tools +bootsplash +bootsplash-theme