| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-21 02:03:30 +0000 (Thu, 21 Feb 2008) |
| 3 |
New Revision: 1318 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/stage1/stage1-chroot.sh |
| 8 |
trunk/targets/stage2/stage2-chroot.sh |
| 9 |
trunk/targets/support/chroot-functions.sh |
| 10 |
Log: |
| 11 |
Moved creating of stage1 package list to the beginning of stage1-chroot.sh so we can get the output with --debug, added --newuse to the options for stage1, as we should always rebuild any package where the USE has changed, removed removal of portage logs from stage2-chroot.sh since it is being done by cleanup_stages, moved world removal in cleanup_stages into a check for stages 1 through 3, made update_env_settings check for the existence of env-update before running it since we now run update_env_settings by default everywhere chroot-functions.sh is sourced, and added a section to show_debug to list the packages, since we don't yet force-enable verbose with debug. |
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2008-02-20 20:24:08 UTC (rev 1317) |
| 16 |
+++ trunk/ChangeLog 2008-02-21 02:03:30 UTC (rev 1318) |
| 17 |
@@ -1,6 +1,19 @@ |
| 18 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 19 |
# $Id: $ |
| 20 |
|
| 21 |
+ 21 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 22 |
+ targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, |
| 23 |
+ targets/support/chroot-functions.sh: |
| 24 |
+ Moved creating of stage1 package list to the beginning of stage1-chroot.sh |
| 25 |
+ so we can get the output with --debug, added --newuse to the options for |
| 26 |
+ stage1, as we should always rebuild any package where the USE has changed, |
| 27 |
+ removed removal of portage logs from stage2-chroot.sh since it is being done |
| 28 |
+ by cleanup_stages, moved world removal in cleanup_stages into a check for |
| 29 |
+ stages 1 through 3, made update_env_settings check for the existence of |
| 30 |
+ env-update before running it since we now run update_env_settings by default |
| 31 |
+ everywhere chroot-functions.sh is sourced, and added a section to show_debug |
| 32 |
+ to list the packages, since we don't yet force-enable verbose with debug. |
| 33 |
+ |
| 34 |
20 Feb 2008; Chris Gianelloni <wolf31o2@g.o> catalyst, |
| 35 |
modules/catalyst_lock.py: |
| 36 |
Since my python sucks and I don't feel like troubleshooting it at the |
| 37 |
|
| 38 |
Modified: trunk/targets/stage1/stage1-chroot.sh |
| 39 |
=================================================================== |
| 40 |
--- trunk/targets/stage1/stage1-chroot.sh 2008-02-20 20:24:08 UTC (rev 1317) |
| 41 |
+++ trunk/targets/stage1/stage1-chroot.sh 2008-02-21 02:03:30 UTC (rev 1318) |
| 42 |
@@ -1,9 +1,11 @@ |
| 43 |
#!/bin/bash |
| 44 |
|
| 45 |
+# We do this first, so we know our package list for --debug |
| 46 |
+export clst_buildpkgs="$(/tmp/build.py)" |
| 47 |
+ |
| 48 |
source /tmp/chroot-functions.sh |
| 49 |
|
| 50 |
# Setup our environment |
| 51 |
-export clst_buildpkgs="$(/tmp/build.py)" |
| 52 |
export STAGE1_USE="$(portageq envvar STAGE1_USE)" |
| 53 |
export USE="-* bindist build ${STAGE1_USE}" |
| 54 |
export FEATURES="${clst_myfeatures} nodoc noman noinfo" |
| 55 |
@@ -22,4 +24,4 @@ |
| 56 |
|
| 57 |
USE="-build" run_emerge "--oneshot --nodeps virtual/baselayout" |
| 58 |
|
| 59 |
-USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}" run_emerge "--noreplace --oneshot ${clst_buildpkgs}" |
| 60 |
+USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}" run_emerge "--noreplace --oneshot --newuse ${clst_buildpkgs}" |
| 61 |
|
| 62 |
Modified: trunk/targets/stage2/stage2-chroot.sh |
| 63 |
=================================================================== |
| 64 |
--- trunk/targets/stage2/stage2-chroot.sh 2008-02-20 20:24:08 UTC (rev 1317) |
| 65 |
+++ trunk/targets/stage2/stage2-chroot.sh 2008-02-21 02:03:30 UTC (rev 1318) |
| 66 |
@@ -20,4 +20,3 @@ |
| 67 |
## START BUILD |
| 68 |
/usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1 |
| 69 |
|
| 70 |
-rm -f /var/log/emerge.log /var/log/portage/elog/* |
| 71 |
|
| 72 |
Modified: trunk/targets/support/chroot-functions.sh |
| 73 |
=================================================================== |
| 74 |
--- trunk/targets/support/chroot-functions.sh 2008-02-20 20:24:08 UTC (rev 1317) |
| 75 |
+++ trunk/targets/support/chroot-functions.sh 2008-02-21 02:03:30 UTC (rev 1318) |
| 76 |
@@ -202,15 +202,30 @@ |
| 77 |
then |
| 78 |
cleanup_icecream |
| 79 |
fi |
| 80 |
- rm -f /var/lib/portage/world |
| 81 |
- touch /var/lib/portage/world |
| 82 |
+ case ${clst_target} in |
| 83 |
+ stage1|stage2|stage3) |
| 84 |
+ rm -f /var/lib/portage/world |
| 85 |
+ touch /var/lib/portage/world |
| 86 |
+ ;; |
| 87 |
+ *) |
| 88 |
+ echo "Skipping removal of world file for ${clst_target}" |
| 89 |
+ ;; |
| 90 |
+ esac |
| 91 |
|
| 92 |
rm -f /var/log/emerge.log /var/log/portage/elog/* |
| 93 |
rm -rf /var/tmp/* |
| 94 |
} |
| 95 |
|
| 96 |
update_env_settings(){ |
| 97 |
- /usr/sbin/env-update |
| 98 |
+ which env-update > /dev/null 2>&1 |
| 99 |
+ ret=$? |
| 100 |
+ if [ $ret -eq 0 ] |
| 101 |
+ then |
| 102 |
+ ENV_UPDATE=`which env-update` |
| 103 |
+ ${ENV_UPDATE} |
| 104 |
+ else |
| 105 |
+ echo "WARNING: env-update not found, skipping!" |
| 106 |
+ fi |
| 107 |
source /etc/profile |
| 108 |
[ -f /tmp/envscript ] && source /tmp/envscript |
| 109 |
} |
| 110 |
@@ -265,7 +280,9 @@ |
| 111 |
show_debug() { |
| 112 |
if [ "${clst_DEBUG}" = "1" ] |
| 113 |
then |
| 114 |
+ unset PACKAGES |
| 115 |
echo "DEBUG:" |
| 116 |
+ echo "Profile/target info:" |
| 117 |
echo "Profile inheritance:" |
| 118 |
python -c 'import portage; print portage.settings.profiles' |
| 119 |
echo |
| 120 |
@@ -287,6 +304,21 @@ |
| 121 |
echo "KERNEL_ABI: $(portageq envvar KERNEL_ABI)" |
| 122 |
echo "MULTILIB_ABIS: $(portageq envvar MULTILIB_ABIS)" |
| 123 |
echo |
| 124 |
+ ### XXX: This is temporary until we make --debug force-enable --verbose |
| 125 |
+ if [ -n "${clst_buildpkgs}" ] |
| 126 |
+ then |
| 127 |
+ PACKAGES=${clst_buildpkgs} |
| 128 |
+ elif [ -n "${clst_packages}" ] |
| 129 |
+ then |
| 130 |
+ PACKAGES=${clst_packages} |
| 131 |
+ fi |
| 132 |
+ if [ -n "${PACKAGES}" ] |
| 133 |
+ then |
| 134 |
+ echo "Packages:" |
| 135 |
+ echo "${PACKAGES}" |
| 136 |
+ echo |
| 137 |
+ fi |
| 138 |
+ ### XXX: end of section to remove |
| 139 |
fi |
| 140 |
} |
| 141 |
|
| 142 |
|
| 143 |
-- |
| 144 |
gentoo-commits@l.g.o mailing list |
Archives