| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-21 06:33:29 +0000 (Thu, 21 Feb 2008) |
| 3 |
New Revision: 1319 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/catalyst |
| 8 |
trunk/targets/support/chroot-functions.sh |
| 9 |
Log: |
| 10 |
Adding a note to myself for better debug and moving run_default_funcs to the bottom of the script so it gets executed. Since this can otherwise break pkgcache, I'm making this catalyst 2.0.6_pre9 for testing, immediately. |
| 11 |
|
| 12 |
Modified: trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/ChangeLog 2008-02-21 02:03:30 UTC (rev 1318) |
| 15 |
+++ trunk/ChangeLog 2008-02-21 06:33:29 UTC (rev 1319) |
| 16 |
@@ -1,6 +1,12 @@ |
| 17 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 18 |
# $Id: $ |
| 19 |
|
| 20 |
+ 21 Feb 2008; Chris Gianelloni <wolf31o2@g.o> catalyst, |
| 21 |
+ targets/support/chroot-functions.sh: |
| 22 |
+ Adding a note to myself for better debug and moving run_default_funcs to the |
| 23 |
+ bottom of the script so it gets executed. Since this can otherwise break |
| 24 |
+ pkgcache, I'm making this catalyst 2.0.6_pre9 for testing, immediately. |
| 25 |
+ |
| 26 |
21 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 27 |
targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, |
| 28 |
targets/support/chroot-functions.sh: |
| 29 |
|
| 30 |
Modified: trunk/catalyst |
| 31 |
=================================================================== |
| 32 |
--- trunk/catalyst 2008-02-21 02:03:30 UTC (rev 1318) |
| 33 |
+++ trunk/catalyst 2008-02-21 06:33:29 UTC (rev 1319) |
| 34 |
@@ -8,7 +8,7 @@ |
| 35 |
import pdb |
| 36 |
|
| 37 |
__maintainer__="Chris Gianelloni <wolf31o2@g.o>" |
| 38 |
-__version__="2.0.6_pre8" |
| 39 |
+__version__="2.0.6_pre9" |
| 40 |
|
| 41 |
conf_values={} |
| 42 |
|
| 43 |
|
| 44 |
Modified: trunk/targets/support/chroot-functions.sh |
| 45 |
=================================================================== |
| 46 |
--- trunk/targets/support/chroot-functions.sh 2008-02-21 02:03:30 UTC (rev 1318) |
| 47 |
+++ trunk/targets/support/chroot-functions.sh 2008-02-21 06:33:29 UTC (rev 1319) |
| 48 |
@@ -14,9 +14,6 @@ |
| 49 |
# * kernel recognizes this and generates SIGINT signal |
| 50 |
trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT |
| 51 |
|
| 52 |
-# We do this everywhere, so why not put it in this script |
| 53 |
-run_default_funcs |
| 54 |
- |
| 55 |
check_genkernel_version(){ |
| 56 |
if [ -x /usr/bin/genkernel ] |
| 57 |
then |
| 58 |
@@ -285,6 +282,9 @@ |
| 59 |
echo "Profile/target info:" |
| 60 |
echo "Profile inheritance:" |
| 61 |
python -c 'import portage; print portage.settings.profiles' |
| 62 |
+ # TODO: grab our entire env |
| 63 |
+ # <zmedico> to get see the ebuild env you can do something like: |
| 64 |
+ # `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc |
| 65 |
echo |
| 66 |
echo "STAGE1_USE: $(portageq envvar STAGE1_USE)" |
| 67 |
echo |
| 68 |
@@ -323,7 +323,7 @@ |
| 69 |
} |
| 70 |
|
| 71 |
run_default_funcs() { |
| 72 |
- if [ -z "${RUN_DEFAULT_FUNCS}" ] |
| 73 |
+ if [ "${RUN_DEFAULT_FUNCS}" != "no" ] |
| 74 |
then |
| 75 |
update_env_settings |
| 76 |
setup_myfeatures |
| 77 |
@@ -419,3 +419,7 @@ |
| 78 |
Comment=This is a link to the local copy of the Gentoo Linux Handbook. |
| 79 |
Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop |
| 80 |
} |
| 81 |
+ |
| 82 |
+# We do this everywhere, so why not put it in this script |
| 83 |
+run_default_funcs |
| 84 |
+ |
| 85 |
|
| 86 |
-- |
| 87 |
gentoo-commits@l.g.o mailing list |
Archives