| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-04-25 02:21:26 +0000 (Fri, 25 Apr 2008) |
| 3 |
New Revision: 1402 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/stage1/stage1-preclean-chroot.sh |
| 8 |
trunk/targets/stage2/stage2-preclean-chroot.sh |
| 9 |
trunk/targets/stage3/stage3-preclean-chroot.sh |
| 10 |
trunk/targets/stage4/stage4-preclean-chroot.sh |
| 11 |
Log: |
| 12 |
We probably shouldn't be running our debug functions in our stages. Let's fix this. |
| 13 |
|
| 14 |
Modified: trunk/ChangeLog |
| 15 |
=================================================================== |
| 16 |
--- trunk/ChangeLog 2008-04-24 02:03:40 UTC (rev 1401) |
| 17 |
+++ trunk/ChangeLog 2008-04-25 02:21:26 UTC (rev 1402) |
| 18 |
@@ -1,6 +1,14 @@ |
| 19 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 20 |
# $Id: $ |
| 21 |
|
| 22 |
+ 25 Apr 2008; Chris Gianelloni <wolf31o2@g.o> |
| 23 |
+ targets/stage1/stage1-preclean-chroot.sh, |
| 24 |
+ targets/stage2/stage2-preclean-chroot.sh, |
| 25 |
+ targets/stage3/stage3-preclean-chroot.sh, |
| 26 |
+ targets/stage4/stage4-preclean-chroot.sh: |
| 27 |
+ We probably shouldn't be running our debug functions in our stages. Let's |
| 28 |
+ fix this. |
| 29 |
+ |
| 30 |
24 Apr 2008; Chris Gianelloni <wolf31o2@g.o> |
| 31 |
targets/support/chroot-functions.sh: |
| 32 |
Added a get_libdir call and fail if we don't have a valid LIBDIR when using |
| 33 |
|
| 34 |
Modified: trunk/targets/stage1/stage1-preclean-chroot.sh |
| 35 |
=================================================================== |
| 36 |
--- trunk/targets/stage1/stage1-preclean-chroot.sh 2008-04-24 02:03:40 UTC (rev 1401) |
| 37 |
+++ trunk/targets/stage1/stage1-preclean-chroot.sh 2008-04-25 02:21:26 UTC (rev 1402) |
| 38 |
@@ -1,7 +1,13 @@ |
| 39 |
#!/bin/bash |
| 40 |
|
| 41 |
+export RUN_DEFAULT_FUNCS="no" |
| 42 |
+ |
| 43 |
source /tmp/chroot-functions.sh |
| 44 |
|
| 45 |
+# Since we didn't run the default functions, we call a couple here. |
| 46 |
+update_env_settings |
| 47 |
+setup_myfeatures |
| 48 |
+ |
| 49 |
# Now, some finishing touches to initialize gcc-config.... |
| 50 |
unset ROOT |
| 51 |
|
| 52 |
|
| 53 |
Modified: trunk/targets/stage2/stage2-preclean-chroot.sh |
| 54 |
=================================================================== |
| 55 |
--- trunk/targets/stage2/stage2-preclean-chroot.sh 2008-04-24 02:03:40 UTC (rev 1401) |
| 56 |
+++ trunk/targets/stage2/stage2-preclean-chroot.sh 2008-04-25 02:21:26 UTC (rev 1402) |
| 57 |
@@ -1,7 +1,13 @@ |
| 58 |
#!/bin/bash |
| 59 |
|
| 60 |
+export RUN_DEFAULT_FUNCS="no" |
| 61 |
+ |
| 62 |
source /tmp/chroot-functions.sh |
| 63 |
|
| 64 |
+# Since we didn't run the default functions, we call a couple here. |
| 65 |
+update_env_settings |
| 66 |
+setup_myfeatures |
| 67 |
+ |
| 68 |
cleanup_stages |
| 69 |
|
| 70 |
if [ -n "${clst_CCACHE}" ] |
| 71 |
|
| 72 |
Modified: trunk/targets/stage3/stage3-preclean-chroot.sh |
| 73 |
=================================================================== |
| 74 |
--- trunk/targets/stage3/stage3-preclean-chroot.sh 2008-04-24 02:03:40 UTC (rev 1401) |
| 75 |
+++ trunk/targets/stage3/stage3-preclean-chroot.sh 2008-04-25 02:21:26 UTC (rev 1402) |
| 76 |
@@ -1,7 +1,13 @@ |
| 77 |
#!/bin/bash |
| 78 |
|
| 79 |
+export RUN_DEFAULT_FUNCS="no" |
| 80 |
+ |
| 81 |
source /tmp/chroot-functions.sh |
| 82 |
|
| 83 |
+# Since we didn't run the default functions, we call a couple here. |
| 84 |
+update_env_settings |
| 85 |
+setup_myfeatures |
| 86 |
+ |
| 87 |
cleanup_stages |
| 88 |
|
| 89 |
if [ -n "${clst_CCACHE}" ] |
| 90 |
|
| 91 |
Modified: trunk/targets/stage4/stage4-preclean-chroot.sh |
| 92 |
=================================================================== |
| 93 |
--- trunk/targets/stage4/stage4-preclean-chroot.sh 2008-04-24 02:03:40 UTC (rev 1401) |
| 94 |
+++ trunk/targets/stage4/stage4-preclean-chroot.sh 2008-04-25 02:21:26 UTC (rev 1402) |
| 95 |
@@ -1,7 +1,13 @@ |
| 96 |
#!/bin/bash |
| 97 |
|
| 98 |
+export RUN_DEFAULT_FUNCS="no" |
| 99 |
+ |
| 100 |
source /tmp/chroot-functions.sh |
| 101 |
|
| 102 |
+# Since we didn't run the default functions, we call a couple here. |
| 103 |
+update_env_settings |
| 104 |
+setup_myfeatures |
| 105 |
+ |
| 106 |
if [ -n "${clst_DISTCC}" ] |
| 107 |
then |
| 108 |
cleanup_distcc |
| 109 |
|
| 110 |
-- |
| 111 |
gentoo-commits@l.g.o mailing list |
Archives