diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-14 15:49:03 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-14 15:49:03 +0000 |
commit | e2eb8d74b7c9efe65b622485722cdf916f7362fa (patch) | |
tree | 0df42fdb9536b9fec624bfa4a23f0a98458049eb | |
parent | Removed gcloop. It has been deprecated for some time now. (diff) | |
download | gentoo-e2eb8d74b7c9efe65b622485722cdf916f7362fa.tar.gz gentoo-e2eb8d74b7c9efe65b622485722cdf916f7362fa.tar.bz2 gentoo-e2eb8d74b7c9efe65b622485722cdf916f7362fa.zip |
Changed catalyst's verbose option to use --tree, as it allows us to see dependencies better and assists in troubleshooting.
-rw-r--r-- | src/catalyst/ChangeLog | 12 | ||||
-rw-r--r-- | src/catalyst/livecd/runscript/default-runscript.sh | 54 | ||||
-rw-r--r-- | src/catalyst/targets/embedded/embedded-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/grp/grp-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/netboot/netboot-packages.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/stage1/stage1-chroot.sh | 24 | ||||
-rw-r--r-- | src/catalyst/targets/stage2/stage2-chroot.sh | 14 | ||||
-rw-r--r-- | src/catalyst/targets/stage3/stage3-chroot.sh | 13 | ||||
-rw-r--r-- | src/catalyst/targets/tinderbox/tinderbox-chroot.sh | 4 |
10 files changed, 60 insertions, 77 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index b64d72c81a..710cd31c99 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.103 2005/07/13 19:56:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.104 2005/07/14 15:49:03 wolf31o2 Exp $ + + 14 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> + livecd/runscript/default-runscript.sh, + targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, + targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/netboot/netboot-packages.sh, targets/stage1/stage1-chroot.sh, + targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh, + targets/tinderbox/tinderbox-chroot.sh: + Changed catalyst's verbose option to use --tree, as it allows us to see + dependencies better and assists in troubleshooting. 13 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> examples/livecd-stage2_template.spec, diff --git a/src/catalyst/livecd/runscript/default-runscript.sh b/src/catalyst/livecd/runscript/default-runscript.sh index 5a75c0f130..1c2c762df1 100644 --- a/src/catalyst/livecd/runscript/default-runscript.sh +++ b/src/catalyst/livecd/runscript/default-runscript.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.25.2.7 2005/07/13 19:56:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.25.2.8 2005/07/14 15:49:03 wolf31o2 Exp $ #return codes to be used by archscript die() { @@ -31,31 +31,33 @@ touch ${clst_cdroot_path}/livecd cp ${clst_sharedir}/livecd/files/README.txt ${clst_cdroot_path} create_normal_loop() { - - #We get genkernel-built kernels and initrds in place, create the loopback fs on - #$clst_cdroot_path, mount it, copy our bootable filesystem over, umount it, and - #we then have a ready-to-burn ISO tree at $clst_cdroot_path. - - echo "Calculating size of loopback filesystem..." - loopsize=`du -ks ${clst_chroot_path} | cut -f1` - [ "${loopsize}" = "0" ] && loopsize=1 - # Add 4MB for filesystem slop - loopsize=`expr ${loopsize} + 4096` - echo "Creating loopback file..." - dd if=/dev/zero of=${clst_cdroot_path}/livecd.loop bs=1k count=${loopsize} || die "livecd.loop creation failure" - mke2fs -m 0 -F -q ${clst_cdroot_path}/livecd.loop || die "Couldn't create ext2 filesystem" - install -d ${clst_cdroot_path}/loopmount - sync; sync; sleep 3 #try to work around 2.6.0+ loopback bug - mount -t ext2 -o loop ${clst_cdroot_path}/livecd.loop ${clst_cdroot_path}/loopmount || die "Couldn't mount loopback ext2 filesystem" - sync; sync; sleep 3 #try to work around 2.6.0+ loopback bug - echo "cp -a ${clst_chroot_path}/* ${clst_cdroot_path}/loopmount" - cp -a ${clst_chroot_path}/* ${clst_cdroot_path}/loopmount - - [ $? -ne 0 ] && { umount ${clst_cdroot_path}/loopmount; die "Couldn't copy files to loopback ext2 filesystem"; } - umount ${clst_cdroot_path}/loopmount || die "Couldn't unmount loopback ext2 filesystem" - rm -rf ${clst_cdroot_path}/loopmount - #now, $clst_cdroot_path should contain a proper bootable image for our iso, including - #boot loader and loopback filesystem. + # We get genkernel-built kernels and initrds in place, create the loopback + # filesystem on $clst_cdroot_path, mount it, copy our bootable filesystem + # over, umount it, and we then have a ready-to-burn ISO tree at + # $clst_cdroot_path. + + echo "Calculating size of loopback filesystem..." + loopsize=`du -ks ${clst_chroot_path} | cut -f1` + [ "${loopsize}" = "0" ] && loopsize=1 + # Add 4MB for filesystem slop + loopsize=`expr ${loopsize} + 4096` + echo "Creating loopback file..." + dd if=/dev/zero of=${clst_cdroot_path}/livecd.loop bs=1k count=${loopsize} \ + || die "livecd.loop creation failure" + mke2fs -m 0 -F -q ${clst_cdroot_path}/livecd.loop \ + || die "Couldn't create ext2 filesystem" + install -d ${clst_cdroot_path}/loopmount + sync; sync; sleep 3 #try to work around 2.6.0+ loopback bug + mount -t ext2 -o loop ${clst_cdroot_path}/livecd.loop \ + ${clst_cdroot_path}/loopmount \ + || die "Couldn't mount loopback ext2 filesystem" + sync; sync; sleep 3 #try to work around 2.6.0+ loopback bug + echo "cp -a ${clst_chroot_path}/* ${clst_cdroot_path}/loopmount" + cp -a ${clst_chroot_path}/* ${clst_cdroot_path}/loopmount + + [ $? -ne 0 ] && { umount ${clst_cdroot_path}/loopmount; die "Couldn't copy files to loopback ext2 filesystem"; } + umount ${clst_cdroot_path}/loopmount || die "Couldn't unmount loopback ext2 filesystem" + rm -rf ${clst_cdroot_path}/loopmount } create_zisofs() { diff --git a/src/catalyst/targets/embedded/embedded-chroot.sh b/src/catalyst/targets/embedded/embedded-chroot.sh index ceb432879d..193647496e 100644 --- a/src/catalyst/targets/embedded/embedded-chroot.sh +++ b/src/catalyst/targets/embedded/embedded-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded-chroot.sh,v 1.13.2.2 2005/07/13 00:04:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded-chroot.sh,v 1.13.2.3 2005/07/14 15:49:03 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -57,7 +57,7 @@ fi ## START BUILD if [ "${clst_VERBOSE}" ] then - ROOT=/tmp/mergeroot emerge ${clst_myemergeopts} -vp ${clst_embedded_packages} || exit 1 + ROOT=/tmp/mergeroot emerge ${clst_myemergeopts} -vtp ${clst_embedded_packages} || exit 1 echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] diff --git a/src/catalyst/targets/grp/grp-chroot.sh b/src/catalyst/targets/grp/grp-chroot.sh index 23dccb596e..d6fb4add5b 100644 --- a/src/catalyst/targets/grp/grp-chroot.sh +++ b/src/catalyst/targets/grp/grp-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-chroot.sh,v 1.14.2.5 2005/07/13 00:04:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-chroot.sh,v 1.14.2.6 2005/07/14 15:49:03 wolf31o2 Exp $ # check portage version in seed stage portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ @@ -59,7 +59,7 @@ then if [ -n "${clst_VERBOSE}" ] then - emerge --usepkg --buildpkg --noreplace --newuse -vp ${clst_myemergeopts} ${clst_grp_packages} || exit 1 + emerge --usepkg --buildpkg --noreplace --newuse -vtp ${clst_myemergeopts} ${clst_grp_packages} || exit 1 echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] diff --git a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh b/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh index 9bc4ed4827..c76cfbe64e 100644 --- a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-chroot.sh,v 1.15.2.3 2005/07/13 00:04:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-chroot.sh,v 1.15.2.4 2005/07/14 15:49:03 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -51,7 +51,7 @@ export USE_ORDER="env:pkg:conf:defaults" if [ "${clst_VERBOSE}" ] then - emerge ${clst_emergeopts} -vp ${clst_packages} + emerge ${clst_emergeopts} -vtp ${clst_packages} echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] diff --git a/src/catalyst/targets/netboot/netboot-packages.sh b/src/catalyst/targets/netboot/netboot-packages.sh index 2f71d71d93..78f30a3130 100644 --- a/src/catalyst/targets/netboot/netboot-packages.sh +++ b/src/catalyst/targets/netboot/netboot-packages.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-packages.sh,v 1.6.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-packages.sh,v 1.6.2.2 2005/07/14 15:49:03 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -30,7 +30,7 @@ fi # START BUILD if [ "${clst_VERBOSE}" ] then - emerge ${clst_myemergeopts} -vp ${clst_packages} + emerge ${clst_myemergeopts} -vtp ${clst_packages} echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] diff --git a/src/catalyst/targets/stage1/stage1-chroot.sh b/src/catalyst/targets/stage1/stage1-chroot.sh index fa94ce7cf3..328acd0aab 100644 --- a/src/catalyst/targets/stage1/stage1-chroot.sh +++ b/src/catalyst/targets/stage1/stage1-chroot.sh @@ -1,31 +1,11 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-chroot.sh,v 1.29.2.8 2005/07/13 00:04:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-chroot.sh,v 1.29.2.9 2005/07/14 15:49:03 wolf31o2 Exp $ -portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ - | cut -d/ -f2 | cut -d- -f2,3` -if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ] -then - echo "ERROR: Your portage version is too low in your seed stage. Portage version" - echo "2.0.51 or greater is required." - exit 1 -fi - /usr/sbin/env-update source /etc/profile -#if [ -x /usr/bin/gcc-config ] -#then -# gcc_current=`gcc-config -c` -# if [ -z "${gcc_current}" ] -# then -# gcc_current=1 -# fi -# gcc-config 3 && source /etc/profile -# gcc-config ${gcc_current} && source /etc/profile -#fi - [ -f /tmp/envscript ] && source /tmp/envscript if [ -n "${clst_CCACHE}" ] @@ -69,7 +49,7 @@ fi if [ -n "${clst_VERBOSE}" ] then - USE="-* build" emerge ${clst_myemergeopts} -vp --noreplace ${clst_buildpkgs} || exit 1 + USE="-* build" emerge ${clst_myemergeopts} -vtp --noreplace ${clst_buildpkgs} || exit 1 echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] diff --git a/src/catalyst/targets/stage2/stage2-chroot.sh b/src/catalyst/targets/stage2/stage2-chroot.sh index e113588de7..1a0fada5bb 100644 --- a/src/catalyst/targets/stage2/stage2-chroot.sh +++ b/src/catalyst/targets/stage2/stage2-chroot.sh @@ -1,18 +1,18 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-chroot.sh,v 1.10.2.5 2005/07/13 00:04:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-chroot.sh,v 1.10.2.6 2005/07/14 15:49:03 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile [ -f /tmp/envscript ] && source /tmp/envscript -#if [ -n "${clst_CCACHE}" ] -#then -# export clst_myfeatures="${clst_myfeatures} ccache" -# emerge -b -k --oneshot --nodeps ccache || exit 1 -#fi +if [ -n "${clst_CCACHE}" ] +then + export clst_myfeatures="${clst_myfeatures} ccache" + emerge -b -k --oneshot --nodeps ccache || exit 1 +fi if [ -n "${clst_DISTCC}" ] then @@ -39,7 +39,7 @@ export FEATURES="${clst_myfeatures}" if [ "${clst_VERBOSE}" ] then - /usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts} + /usr/portage/scripts/bootstrap.sh -t ${bootstrap_opts} echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] diff --git a/src/catalyst/targets/stage3/stage3-chroot.sh b/src/catalyst/targets/stage3/stage3-chroot.sh index 6a3bac38a5..01d71f7a76 100644 --- a/src/catalyst/targets/stage3/stage3-chroot.sh +++ b/src/catalyst/targets/stage3/stage3-chroot.sh @@ -1,16 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.17.2.6 2005/07/13 00:04:53 wolf31o2 Exp $ - -portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ - | cut -d/ -f2 | cut -d- -f2,3` -if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ] -then - echo "ERROR: Your portage version is too low in your seed stage. Portage version" - echo "2.0.51 or greater is required." - exit 1 -fi +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.17.2.7 2005/07/14 15:49:03 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -46,7 +37,7 @@ export CONFIG_PROTECT="-*" ## START BUILD if [ -n "${clst_VERBOSE}" ] then - emerge -e ${clst_myemergeopts} -vp system || exit 1 + emerge -e ${clst_myemergeopts} -vtp system || exit 1 echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] diff --git a/src/catalyst/targets/tinderbox/tinderbox-chroot.sh b/src/catalyst/targets/tinderbox/tinderbox-chroot.sh index 0f41910f15..5408229d6b 100644 --- a/src/catalyst/targets/tinderbox/tinderbox-chroot.sh +++ b/src/catalyst/targets/tinderbox/tinderbox-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox-chroot.sh,v 1.10.2.2 2005/07/13 00:04:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox-chroot.sh,v 1.10.2.3 2005/07/14 15:49:03 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -39,7 +39,7 @@ for x in ${clst_tinderbox_packages} do if [ -n "${clst_VERBOSE}" ] then - emerge --usepkg --buildpkg -vp $x + emerge --usepkg --buildpkg -vtp $x echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] |