From: John P. Davis Date: Sun, 4 Apr 2004 16:58:15 +0000 (+0000) Subject: commit for 1.0.5.1 X-Git-Tag: CATALYST_2_0_6_916~1031 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26626febd3d460ef33dc11141d1c762373ec642f;p=catalyst.git commit for 1.0.5.1 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@342 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index c126890c..4e794aa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.34 2004/04/02 21:09:10 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.35 2004/04/04 16:58:15 zhen Exp $ + + 04 Apr 2004; John Davis targets/embedded/embedded.sh, + targets/grp/grp.sh, targets/stage1/stage1-chroot.sh, + targets/stage2/stage2.sh, targets/stage3/stage3.sh, + targets/tinderbox/tinderbox.sh: + fix to address missing /dev in stages, fixed path for env-update in all of the + targets 02 Apr 2004; John Davis modules/targets.py: use broken for grp, livecd-stage1, tinderbox, etc. fixed diff --git a/targets/embedded/embedded.sh b/targets/embedded/embedded.sh index 7e408f93..1cbbfaff 100644 --- a/targets/embedded/embedded.sh +++ b/targets/embedded/embedded.sh @@ -1,6 +1,6 @@ # 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/Attic/embedded.sh,v 1.1 2004/03/22 15:25:52 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded.sh,v 1.2 2004/04/04 16:58:15 zhen Exp $ case $1 in enter) @@ -8,7 +8,7 @@ enter) ;; run) $clst_CHROOT $clst_chroot_path /bin/bash << EOF - env-update + /usr/sbin/env-update source /etc/profile export USE="\${clst_embedded_use}" rm -f /tmp/stage23 diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh index 7c73a23c..fd6b3e7a 100755 --- a/targets/grp/grp.sh +++ b/targets/grp/grp.sh @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.11 2004/03/26 17:03:29 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.12 2004/04/04 16:58:15 zhen Exp $ case $1 in enter) @@ -14,7 +14,7 @@ run) shift export clst_grp_packages="$*" $clst_CHROOT $clst_chroot_path /bin/bash << EOF - env-update + /usr/sbin/env-update source /etc/profile if [ -n "${clst_ENVSCRIPT}" ] then diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 4fe63695..233fc1aa 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -1,20 +1,24 @@ #!/bin/bash -env-update +/usr/sbin/env-update source /etc/profile + if [ -n "${clst_ENVSCRIPT}" ] then source /tmp/envscript rm -f /tmp/envscript fi + case $1 in build) + #emerge and enable ccache before we set ROOT if [ -n "${clst_CCACHE}" ] then export FEATURES="ccache" emerge --oneshot --nodeps ccache || exit 1 fi + if [ -n "${clst_DISTCC}" ] then export FEATURES="distcc" @@ -24,17 +28,27 @@ case $1 in /usr/bin/distcc-config --install 2>&1 > /dev/null /usr/bin/distccd 2>&1 > /dev/null fi + export ROOT=${2} install -d $ROOT + if [ -n "${clst_PKGCACHE}" ] then export EMERGE_OPTS="--usepkg --buildpkg" fi + for x in $(/tmp/build.sh) do echo $x >> /tmp/build.log USE="-* build" emerge ${EMERGE_OPTS} --noreplace $x || exit 1 done + + if [ ! -d /dev ] + then + mkdir -p /dev + cd /dev + MAKEDEV generic-i386 + fi ;; preclean) diff --git a/targets/stage2/stage2.sh b/targets/stage2/stage2.sh index 83530f1a..0ed8f6d8 100755 --- a/targets/stage2/stage2.sh +++ b/targets/stage2/stage2.sh @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.10 2004/03/31 21:56:23 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.11 2004/04/04 16:58:15 zhen Exp $ case $1 in enter) @@ -8,7 +8,7 @@ enter) ;; run) $clst_CHROOT $clst_chroot_path /bin/bash << EOF - env-update + /usr/sbin/env-update source /etc/profile if [ -n "${clst_ENVSCRIPT}" ] then diff --git a/targets/stage3/stage3.sh b/targets/stage3/stage3.sh index b01b354a..4eb9ffa7 100755 --- a/targets/stage3/stage3.sh +++ b/targets/stage3/stage3.sh @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.11 2004/03/26 17:03:29 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.12 2004/04/04 16:58:15 zhen Exp $ case $1 in enter) @@ -8,7 +8,7 @@ enter) ;; run) $clst_CHROOT $clst_chroot_path /bin/bash << EOF - env-update + /usr/sbin/env-update source /etc/profile if [ -n ${ENVSCRIPT} ] then diff --git a/targets/tinderbox/tinderbox.sh b/targets/tinderbox/tinderbox.sh index bb05a488..edd51ee6 100755 --- a/targets/tinderbox/tinderbox.sh +++ b/targets/tinderbox/tinderbox.sh @@ -1,13 +1,13 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox.sh,v 1.4 2004/03/26 17:03:29 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox.sh,v 1.5 2004/04/04 16:58:15 zhen Exp $ case $1 in run) shift export clst_tinderbox_packages="$*" $clst_CHROOT $clst_chroot_path /bin/bash << EOF - env-update + /usr/sbin/env-update source /etc/profile if [ -n "${clst_ENVSCRIPT}" ] then