Index: embedded.sh =================================================================== RCS file: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded.sh,v retrieving revision 1.6 diff -u -B -r1.6 embedded.sh --- embedded.sh 16 Dec 2004 20:01:38 -0000 1.6 +++ embedded.sh 3 Jan 2005 19:32:35 -0000 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded.sh,v 1.6 2004/12/16 20:01:38 wolf31o2 Exp $ +# $Header: /home/cvsroot/gentoo/src/catalyst/targets/embedded/embedded.sh,v 1.4 2004/04/14 22:35:29 zhen Exp $ case $1 in enter) @@ -13,6 +13,13 @@ ${clst_CHROOT} ${clst_chroot_path} /tmp/embedded-chroot.sh || exit 1 rm -f ${clst_chroot_path}/tmp/embedded-chroot.sh ;; + + preclean) + # currently this doesn't do much + cp ${clst_sharedir}/targets/embedded/embedded-preclean-chroot.sh ${clst_chroot_path} + ${clst_CHROOT} ${clst_chroot_path} /tmp/embedded-preclean-chroot.sh || exit 1 + rm -rf ${clst_chroot_path}/tmp/embedded-preclean-chroot.sh + ;; package) export root_fs_path="${clst_chroot_path}/tmp/mergeroot" install -d ${clst_image_path} @@ -21,6 +28,37 @@ echo "Created ${clst_embedded_fs_type} image at ${clst_image_path}/root_fs" echo "Image size: ${imagesize}k" ;; + + # almost the same code as livecd-stage2 + kernel) + shift + numkernels="$1" + cp -a ${clst_sharedir}/livecd/runscript-support/pre-kmerge.sh ${clst_chroot_path}/tmp + ${clst_CHROOT} ${clst_chroot_path} /tmp/pre-kmerge.sh || exit 1 + rm -f ${clst_chroot_path}/tmp/pre-kmerge.sh + cp -a ${clst_sharedir}/targets/embedded/kmerge.sh ${clst_chroot_path}/tmp + count=0 + while [ ${count} -lt ${numkernels} ] + do + sleep 30 + + shift + export clst_kname="$1" + shift + export clst_ksource="$1" + shift + export clst_kextversion="$1" + shift + export clst_gk_action="$1" + echo "exporting clst_gk_action as:${1}" + shift + ${clst_CHROOT} ${clst_chroot_path} /tmp/kmerge.sh || exit 1 + count=$(( ${count} + 1 )) + done + rm -f ${clst_chroot_path}/tmp/pre-kmerge.sh + cp -a ${clst_sharedir}/livecd/runscript-support/post-kmerge.sh ${clst_chroot_path}/tmp + ${clst_CHROOT} ${clst_chroot_path} /tmp/post-kmerge.sh || exit 1 + ;; *) exit 1 ;;